]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: b31387b) | patch
fix git merge: vlan: allow nested vlan_do_receive()
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Tue, 3 Apr 2012 00:16:37 +0000 (17:16 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Tue, 3 Apr 2012 00:16:37 +0000 (17:16 -0700)
commitf205cfbc30b41fdcf5c7cb4ed4f0bcc3bc0a13b9
tree83b9d610b694d419cb4c58b97cb9e7f1bebfe2f0tree
parentb31387b2a8e63cdff4c069456dc051991071a853commit | diff
fix git merge: vlan: allow nested vlan_do_receive()

Git commit was not cleanly cherry-picked but this changes
are under ifdef so build did not fail on that. Fix it now.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
include/linux/if_vlan.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.