diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-19 19:17:35 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-19 19:17:35 -0800 |
commit | da935c66bacb3ed9ada984b053297f87c2dff63a (patch) | |
tree | 46278da2b312c73f1375b830d7e5912bf23abd78 /include/linux/dcbnl.h | |
parent | 9435eb1cf0b76b323019cebf8d16762a50a12a19 (diff) | |
parent | 2205a6ea93fea76f88b43727fea53f3ce3790d6f (diff) | |
download | op-kernel-dev-da935c66bacb3ed9ada984b053297f87c2dff63a.zip op-kernel-dev-da935c66bacb3ed9ada984b053297f87c2dff63a.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
Diffstat (limited to 'include/linux/dcbnl.h')
-rw-r--r-- | include/linux/dcbnl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h index cd8d518..4c5b26e 100644 --- a/include/linux/dcbnl.h +++ b/include/linux/dcbnl.h @@ -106,8 +106,8 @@ struct ieee_pfc { */ struct dcb_app { __u8 selector; - __u32 protocol; __u8 priority; + __u16 protocol; }; struct dcbmsg { |