diff options
| author | Ron Mercer <ron.mercer@qlogic.com> | 2009-02-12 16:36:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-12 16:36:50 -0800 |
| commit | 7a9deb661f5973b414df0c12b496d6ce49c8ed85 (patch) | |
| tree | 324d7de651d0b4e76ed1192673f346552ce4a867 /drivers/net/qlge | |
| parent | d4675b52a933831d4901217564cba5a434ddd922 (diff) | |
| download | kernel_samsung_espresso10-7a9deb661f5973b414df0c12b496d6ce49c8ed85.zip kernel_samsung_espresso10-7a9deb661f5973b414df0c12b496d6ce49c8ed85.tar.gz kernel_samsung_espresso10-7a9deb661f5973b414df0c12b496d6ce49c8ed85.tar.bz2 | |
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/qlge')
| -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 3d1d7b6..27c5e4d 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, if (qdev->vlgrp && (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V)) { QPRINTK(qdev, RX_STATUS, DEBUG, "Passing a VLAN packet upstream.\n"); - vlan_hwaccel_rx(skb, qdev->vlgrp, + vlan_hwaccel_receive_skb(skb, qdev->vlgrp, le16_to_cpu(ib_mac_rsp->vlan_id)); } else { QPRINTK(qdev, RX_STATUS, DEBUG, "Passing a normal packet upstream.\n"); - netif_rx(skb); + netif_receive_skb(skb); } } |