Skip to content

: Vlan update

Patrick McHardy netdev 1 version Applied

Status from this message: Applied.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 3 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/18: Remove unnecessary structure declarationsinclude/linux/if_vlan.h+0 -50 replies
2/18: Clean up vlan_hdr/vlan_ethhdr structsinclude/linux/if_vlan.h+23 -100 replies
3/18: Kill useless VLAN_NAME defineinclude/linux/if_vlan.h net/8021q/vlan.c+2 -40 replies
4/18: Use dev->statsinclude/linux/if_vlan.h net/8021q/vlan.c net/8021q/vlan_dev.c +1 more+6 -180 replies
5/18: Move device setup to vlan_dev.cnet/8021q/vlan.c net/8021q/vlan.h net/8021q/vlan_dev.c+86 -1080 replies
6/18: Kill useless checknet/8021q/vlan_dev.c+0 -180 replies
7/18: Bring back MAC_FMTinclude/linux/if_ether.h+1 -00 replies
8/18: Clean up debugging and printksnet/8021q/vlan.c net/8021q/vlan.h net/8021q/vlan_dev.c +1 more+30 -1380 replies
9/18: Remove non-implemented ioctlsnet/8021q/vlan.c+1 -220 replies
10/18: Clean up initialization codenet/8021q/vlan.c net/8021q/vlanproc.c+70 -920 replies
11/18: Clean up unregister_vlan_devnet/8021q/vlan.c+32 -400 replies
12/18: Simplify vlan unregistrationinclude/linux/if_vlan.h net/8021q/vlan.c net/8021q/vlan.h +1 more+23 -630 replies
13/18: Turn VLAN_DEV_INFO into inline functiondrivers/net/cxgb3/l2t.c drivers/s390/net/qeth_main.c include/linux/if_vlan.h +4 more+54 -510 replies
14/18: Turn __constant_htons into htons where possibleinclude/linux/if_vlan.h+3 -30 replies
15/18: checkpatch cleanupsnet/8021q/vlan.c net/8021q/vlan.h net/8021q/vlan_dev.c +2 more+89 -840 replies
16/18: Update list addressnet/8021q/vlan.c net/8021q/vlan_dev.c+2 -20 replies
17/18: Clean up vlan_skb_recv()net/8021q/vlan_dev.c+24 -890 replies
18/18: Move protocol determination to seperate functionnet/8021q/vlan_dev.c+35 -280 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [VLAN 00/18]: Vlan update

Hi Dave,

the following patches contain a VLAN update for 2.6.25, consisting mainly of minor cleanups removing duplicate code, avoiding forward declarations, makeing functions static etc. Next I'll look into the skb->cb issues with VLAN.

Please apply, thanks.

 drivers/net/cxgb3/l2t.c      |    2 +-
 drivers/s390/net/qeth_main.c |    4 +-
 include/linux/if_ether.h     |    1 +
 include/linux/if_vlan.h      |   61 +++---
 net/8021q/vlan.c             |  437 ++++++++++----------------------------
 net/8021q/vlan.h             |   42 +----
 net/8021q/vlan_dev.c         |  484 ++++++++++++++++++++----------------------
 net/8021q/vlan_netlink.c     |   17 +-
 net/8021q/vlanproc.c         |  107 ++++------
 net/8021q/vlanproc.h         |   11 +-
 10 files changed, 436 insertions(+), 730 deletions(-)

Patrick McHardy (17):
[VLAN]: Remove unnecessary structure declarations [VLAN]: Clean up vlan_hdr/vlan_ethhdr structs [VLAN]: Kill useless VLAN_NAME define
[VLAN]: Use dev->stats
[VLAN]: Move device setup to vlan_dev.c [VLAN]: Kill useless check
[ETHER]: Bring back MAC_FMT
[VLAN]: Clean up debugging and printks [VLAN]: Remove non-implemented ioctls
[VLAN]: Clean up initialization code
[VLAN]: Clean up unregister_vlan_dev
[VLAN]: Simplify vlan unregistration
[VLAN]: Turn VLAN_DEV_INFO into inline function [VLAN]: Turn __constant_htons into htons where possible [VLAN]: checkpatch cleanups
[VLAN]: Update list address
[VLAN]: Clean up vlan_skb_recv()

Pavel Emelyanov (1):
[VLAN]: Move protocol determination to seperate function