bnx2x: add a select queue callback

This callback required to allow FCoE traffic to be
sent on separate priority queue from other L2 traffic,
which is managed by PFC in HW.

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr@broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index fa12365faec2b398edc5723d0dd615bebd08df12..10eef54343864a943cb8d7d437bc9dd48d88df11 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1167,6 +1167,35 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
        netif_tx_disable(bp->dev);
 }
 
+u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+#ifdef BCM_CNIC
+       struct bnx2x *bp = netdev_priv(dev);
+       if (NO_FCOE(bp))
+               return skb_tx_hash(dev, skb);
+       else {
+               struct ethhdr *hdr = (struct ethhdr *)skb->data;
+               u16 ether_type = ntohs(hdr->h_proto);
+
+               /* Skip VLAN tag if present */
+               if (ether_type == ETH_P_8021Q) {
+                       struct vlan_ethhdr *vhdr =
+                               (struct vlan_ethhdr *)skb->data;
+
+                       ether_type = ntohs(vhdr->h_vlan_encapsulated_proto);
+               }
+
+               /* If ethertype is FCoE or FIP - use FCoE ring */
+               if ((ether_type == ETH_P_FCOE) || (ether_type == ETH_P_FIP))
+                       return bnx2x_fcoe(bp, index);
+       }
+#endif
+       /* Select a none-FCoE queue:  if FCoE is enabled, exclude FCoE L2 ring
+        */
+       return __skb_tx_hash(dev, skb,
+                       dev->real_num_tx_queues - FCOE_CONTEXT_USE);
+}
+
 void bnx2x_set_num_queues(struct bnx2x *bp)
 {
        switch (bp->multi_mode) {

diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/bnx2x/bnx2x_cmn.h
index 4bb011358ed9a4a41605dd156dab0cee7fd65aab..258f0c04716bc78c349e007e296fd94d6873e28a 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/bnx2x/bnx2x_cmn.h
@@ -343,6 +343,9 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode);
 /* hard_xmit callback */
 netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev);
 
+/* select_queue callback */
+u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb);
+
 int bnx2x_change_mac_addr(struct net_device *dev, void *p);
 
 /* NAPI poll Rx part */

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index e6e2746e8bfe941870e3f6c9e3ef9236c882e453..563b2cb8e544831801557bbb2a7691f94cd44ec6 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -8977,6 +8977,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {
        .ndo_open               = bnx2x_open,
        .ndo_stop               = bnx2x_close,
        .ndo_start_xmit         = bnx2x_start_xmit,
+       .ndo_select_queue       = bnx2x_select_queue,
        .ndo_set_multicast_list = bnx2x_set_rx_mode,
        .ndo_set_mac_address    = bnx2x_change_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,