diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 12:55:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 12:55:20 -0700 |
| commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
| tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /include | |
| parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
| parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
| download | op-kernel-dev-421355de876b9f3fcc7e4cb6026e416fb12a5068.zip op-kernel-dev-421355de876b9f3fcc7e4cb6026e416fb12a5068.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 466859b..c75b960 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1669,6 +1669,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw); * to this function and ieee80211_rx_irqsafe() may not be mixed for a * single hardware. * + * Note that right now, this function must be called with softirqs disabled. + * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call */ diff --git a/include/net/sock.h b/include/net/sock.h index 10669b0..1364428 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -226,12 +226,12 @@ struct sock { #define sk_prot __sk_common.skc_prot #define sk_net __sk_common.skc_net kmemcheck_bitfield_begin(flags); - unsigned char sk_shutdown : 2, - sk_no_check : 2, - sk_userlocks : 4; + unsigned int sk_shutdown : 2, + sk_no_check : 2, + sk_userlocks : 4, + sk_protocol : 8, + sk_type : 16; kmemcheck_bitfield_end(flags); - unsigned char sk_protocol; - unsigned short sk_type; int sk_rcvbuf; socket_lock_t sk_lock; /* |
