diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 16:02:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 16:02:00 -0800 |
| commit | ef3242859fae47e728b50b7ce3d17b201a71779a (patch) | |
| tree | 7857320b5209cafc231b329b9dab67ddb53f8128 /include/linux | |
| parent | b5f7376eb30538d03dd27f6a59b5b2d28587967c (diff) | |
| parent | 518d020a18716024187ee0b834c8f5bfebd59398 (diff) | |
| download | linux-stable-ef3242859fae47e728b50b7ce3d17b201a71779a.tar.gz linux-stable-ef3242859fae47e728b50b7ce3d17b201a71779a.tar.bz2 linux-stable-ef3242859fae47e728b50b7ce3d17b201a71779a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
Added support for usb ethernet (0x0fe6, 0x9700)
r8169: fix RTL8168DP power off issue.
r8169: correct settings of rtl8102e.
r8169: fix incorrect args to oob notify.
DM9000B: Fix PHY power for network down/up
DM9000B: Fix reg_save after spin_lock in dm9000_timeout
net_sched: long word align struct qdisc_skb_cb data
sfc: lower stack usage in efx_ethtool_self_test
bridge: Use IPv6 link-local address for multicast listener queries
bridge: Fix MLD queries' ethernet source address
bridge: Allow mcast snooping for transient link local addresses too
ipv6: Add IPv6 multicast address flag defines
bridge: Add missing ntohs()s for MLDv2 report parsing
bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report
bridge: Fix IPv6 multicast snooping by storing correct protocol type
p54pci: update receive dma buffers before and after processing
fix cfg80211_wext_siwfreq lock ordering...
rt2x00: Fix WPA TKIP Michael MIC failures.
ath5k: Fix fast channel switching
tcp: undo_retrans counter fixes
...
Diffstat (limited to 'include/linux')
| -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 68cd248f6d3e..66900e3c6eb1 100644 --- a/include/linux/dcbnl.h +++ b/include/linux/dcbnl.h @@ -101,8 +101,8 @@ struct ieee_pfc { */ struct dcb_app { __u8 selector; - __u32 protocol; __u8 priority; + __u16 protocol; }; struct dcbmsg { |