From: David S. Miller Date: Fri, 19 Apr 2013 18:46:27 +0000 (-0400) Subject: Merge branch '8021ad' X-Git-Tag: v3.10-rc1~120^2~89 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=447b816fe03898c4dad19b254ca3dd05bae46ec3;p=~emulex%2Finfiniband.git Merge branch '8021ad' Patrick McHardy says: ==================== The following patches add support for 802.1ad (provider tagging) to the VLAN driver. The patchset consists of the following parts: - renaming of the NET_F_HW_VLAN feature flags to indicate that they only operate on CTAGs - preparation for 802.1ad VLAN filtering offload by adding a proto argument to the rx_{add,kill}_vid net_device_ops callbacks - preparation of the VLAN code to support multiple protocols by making the protocol used for tagging a property of the VLAN device and converting the device lookup functions accordingly - second step of preparation of the VLAN code by making the packet tagging functions take a protocol argument - introducation of 802.1ad support in the VLAN code, consisting mainly of checking for ETH_P_8021AD in a couple of places and testing the netdevice offload feature checks to take the protocol into account - announcement of STAG offloading capabilities in a couple of drivers for virtual network devices The patchset is based on net-next.git and has been tested with single and double tagging with and without HW acceleration (for CTAGs). ==================== Signed-off-by: David S. Miller --- 447b816fe03898c4dad19b254ca3dd05bae46ec3