Merge branch 'qlge'

Browse source

Jitendra Kalsaria says:

====================
This patch series enhance the handling of nested vlan tags in Rx path.

V2 changes:
* removed module parameter.

V3 changes:
* Users can enable or disable hardware VLAN acceleration using ethtool
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2013-09-27 17:02:24 -04:00

parent fac87a8ecd 146669a5ab

commit 0a325758a8

2 changed files with 102 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/net/ethernet/qlogic/qlge/qlge.h

View file

126

drivers/net/ethernet/qlogic/qlge/qlge_main.c

View file