diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2009-02-12 19:36:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-12 19:36:50 -0500 |
commit | 7a9deb661f5973b414df0c12b496d6ce49c8ed85 (patch) | |
tree | 324d7de651d0b4e76ed1192673f346552ce4a867 /drivers/net | |
parent | d4675b52a933831d4901217564cba5a434ddd922 (diff) |
qlge: bugfix: Use netif_receive_skb() and vlan_hwaccel_receive_skb().
Replace calls to vlan_hwaccel_rx() and netif_rx().
Thanks to Dave Miller for pointing out the the driver was making
the wrong upcall for passing packets into the stack.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 3d1d7b6e55aa..27c5e4de78ec 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -1449,12 +1449,12 @@ static void ql_process_mac_rx_intr(struct ql_adapter *qdev, | |||
1449 | if (qdev->vlgrp && (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V)) { | 1449 | if (qdev->vlgrp && (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V)) { |
1450 | QPRINTK(qdev, RX_STATUS, DEBUG, | 1450 | QPRINTK(qdev, RX_STATUS, DEBUG, |
1451 | "Passing a VLAN packet upstream.\n"); | 1451 | "Passing a VLAN packet upstream.\n"); |
1452 | vlan_hwaccel_rx(skb, qdev->vlgrp, | 1452 | vlan_hwaccel_receive_skb(skb, qdev->vlgrp, |
1453 | le16_to_cpu(ib_mac_rsp->vlan_id)); | 1453 | le16_to_cpu(ib_mac_rsp->vlan_id)); |
1454 | } else { | 1454 | } else { |
1455 | QPRINTK(qdev, RX_STATUS, DEBUG, | 1455 | QPRINTK(qdev, RX_STATUS, DEBUG, |
1456 | "Passing a normal packet upstream.\n"); | 1456 | "Passing a normal packet upstream.\n"); |
1457 | netif_rx(skb); | 1457 | netif_receive_skb(skb); |
1458 | } | 1458 | } |
1459 | } | 1459 | } |
1460 | 1460 | ||