diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /include | |
parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/gigaset_dev.h | 22 | ||||
-rw-r--r-- | include/linux/ieee80211.h | 2 | ||||
-rw-r--r-- | include/linux/if_ether.h | 2 | ||||
-rw-r--r-- | include/net/inet6_hashtables.h | 2 | ||||
-rw-r--r-- | include/net/inet_hashtables.h | 8 | ||||
-rw-r--r-- | include/net/inet_timewait_sock.h | 3 | ||||
-rw-r--r-- | include/net/mac80211.h | 6 | ||||
-rw-r--r-- | include/net/tcp.h | 22 |
8 files changed, 31 insertions, 36 deletions
diff --git a/include/linux/gigaset_dev.h b/include/linux/gigaset_dev.h index 5dc4a316ca37..258ba82937e7 100644 --- a/include/linux/gigaset_dev.h +++ b/include/linux/gigaset_dev.h | |||
@@ -16,15 +16,23 @@ | |||
16 | 16 | ||
17 | #include <linux/ioctl.h> | 17 | #include <linux/ioctl.h> |
18 | 18 | ||
19 | /* The magic IOCTL value for this interface. */ | ||
19 | #define GIGASET_IOCTL 0x47 | 20 | #define GIGASET_IOCTL 0x47 |
20 | 21 | ||
21 | #define GIGVER_DRIVER 0 | 22 | /* enable/disable device control via character device (lock out ISDN subsys) */ |
22 | #define GIGVER_COMPAT 1 | 23 | #define GIGASET_REDIR _IOWR(GIGASET_IOCTL, 0, int) |
23 | #define GIGVER_FWBASE 2 | ||
24 | 24 | ||
25 | #define GIGASET_REDIR _IOWR (GIGASET_IOCTL, 0, int) | 25 | /* enable adapter configuration mode (M10x only) */ |
26 | #define GIGASET_CONFIG _IOWR (GIGASET_IOCTL, 1, int) | 26 | #define GIGASET_CONFIG _IOWR(GIGASET_IOCTL, 1, int) |
27 | #define GIGASET_BRKCHARS _IOW (GIGASET_IOCTL, 2, unsigned char[6]) //FIXME [6] okay? | 27 | |
28 | #define GIGASET_VERSION _IOWR (GIGASET_IOCTL, 3, unsigned[4]) | 28 | /* set break characters (M105 only) */ |
29 | #define GIGASET_BRKCHARS _IOW(GIGASET_IOCTL, 2, unsigned char[6]) | ||
30 | |||
31 | /* get version information selected by arg[0] */ | ||
32 | #define GIGASET_VERSION _IOWR(GIGASET_IOCTL, 3, unsigned[4]) | ||
33 | /* values for GIGASET_VERSION arg[0] */ | ||
34 | #define GIGVER_DRIVER 0 /* get driver version */ | ||
35 | #define GIGVER_COMPAT 1 /* get interface compatibility version */ | ||
36 | #define GIGVER_FWBASE 2 /* get base station firmware version */ | ||
29 | 37 | ||
30 | #endif | 38 | #endif |
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 098bedcde9bb..d62edc7df3ae 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -840,7 +840,7 @@ struct ieee80211_ht_cap { | |||
840 | #define IEEE80211_HT_CAP_DELAY_BA 0x0400 | 840 | #define IEEE80211_HT_CAP_DELAY_BA 0x0400 |
841 | #define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 | 841 | #define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 |
842 | #define IEEE80211_HT_CAP_DSSSCCK40 0x1000 | 842 | #define IEEE80211_HT_CAP_DSSSCCK40 0x1000 |
843 | #define IEEE80211_HT_CAP_PSMP_SUPPORT 0x2000 | 843 | #define IEEE80211_HT_CAP_RESERVED 0x2000 |
844 | #define IEEE80211_HT_CAP_40MHZ_INTOLERANT 0x4000 | 844 | #define IEEE80211_HT_CAP_40MHZ_INTOLERANT 0x4000 |
845 | #define IEEE80211_HT_CAP_LSIG_TXOP_PROT 0x8000 | 845 | #define IEEE80211_HT_CAP_LSIG_TXOP_PROT 0x8000 |
846 | 846 | ||
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 005e1525ab86..299b4121f914 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -137,8 +137,6 @@ extern struct ctl_table ether_table[]; | |||
137 | extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); | 137 | extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); |
138 | 138 | ||
139 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" | 139 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" |
140 | #define MAC_BUF_SIZE 18 | ||
141 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] | ||
142 | 140 | ||
143 | #endif | 141 | #endif |
144 | 142 | ||
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index 92838d3a1ab7..e46674d5daea 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h | |||
@@ -53,7 +53,7 @@ static inline int inet6_sk_ehashfn(const struct sock *sk) | |||
53 | return inet6_ehashfn(net, laddr, lport, faddr, fport); | 53 | return inet6_ehashfn(net, laddr, lport, faddr, fport); |
54 | } | 54 | } |
55 | 55 | ||
56 | extern void __inet6_hash(struct sock *sk); | 56 | extern int __inet6_hash(struct sock *sk, struct inet_timewait_sock *twp); |
57 | 57 | ||
58 | /* | 58 | /* |
59 | * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so | 59 | * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so |
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 41cbddd25b70..74358d1b3f43 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
@@ -251,7 +251,7 @@ extern void inet_put_port(struct sock *sk); | |||
251 | 251 | ||
252 | void inet_hashinfo_init(struct inet_hashinfo *h); | 252 | void inet_hashinfo_init(struct inet_hashinfo *h); |
253 | 253 | ||
254 | extern void __inet_hash_nolisten(struct sock *sk); | 254 | extern int __inet_hash_nolisten(struct sock *sk, struct inet_timewait_sock *tw); |
255 | extern void inet_hash(struct sock *sk); | 255 | extern void inet_hash(struct sock *sk); |
256 | extern void inet_unhash(struct sock *sk); | 256 | extern void inet_unhash(struct sock *sk); |
257 | 257 | ||
@@ -391,10 +391,12 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo, | |||
391 | } | 391 | } |
392 | 392 | ||
393 | extern int __inet_hash_connect(struct inet_timewait_death_row *death_row, | 393 | extern int __inet_hash_connect(struct inet_timewait_death_row *death_row, |
394 | struct sock *sk, u32 port_offset, | 394 | struct sock *sk, |
395 | u32 port_offset, | ||
395 | int (*check_established)(struct inet_timewait_death_row *, | 396 | int (*check_established)(struct inet_timewait_death_row *, |
396 | struct sock *, __u16, struct inet_timewait_sock **), | 397 | struct sock *, __u16, struct inet_timewait_sock **), |
397 | void (*hash)(struct sock *sk)); | 398 | int (*hash)(struct sock *sk, struct inet_timewait_sock *twp)); |
399 | |||
398 | extern int inet_hash_connect(struct inet_timewait_death_row *death_row, | 400 | extern int inet_hash_connect(struct inet_timewait_death_row *death_row, |
399 | struct sock *sk); | 401 | struct sock *sk); |
400 | #endif /* _INET_HASHTABLES_H */ | 402 | #endif /* _INET_HASHTABLES_H */ |
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index b801ade2295e..79f67eae8a7e 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
@@ -201,6 +201,9 @@ extern void inet_twsk_put(struct inet_timewait_sock *tw); | |||
201 | 201 | ||
202 | extern int inet_twsk_unhash(struct inet_timewait_sock *tw); | 202 | extern int inet_twsk_unhash(struct inet_timewait_sock *tw); |
203 | 203 | ||
204 | extern int inet_twsk_bind_unhash(struct inet_timewait_sock *tw, | ||
205 | struct inet_hashinfo *hashinfo); | ||
206 | |||
204 | extern struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, | 207 | extern struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, |
205 | const int state); | 208 | const int state); |
206 | 209 | ||
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index e6b6bf81d5b9..494ac69ff477 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1798,6 +1798,12 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw, | |||
1798 | local_bh_enable(); | 1798 | local_bh_enable(); |
1799 | } | 1799 | } |
1800 | 1800 | ||
1801 | /* | ||
1802 | * The TX headroom reserved by mac80211 for its own tx_status functions. | ||
1803 | * This is enough for the radiotap header. | ||
1804 | */ | ||
1805 | #define IEEE80211_TX_STATUS_HEADROOM 13 | ||
1806 | |||
1801 | /** | 1807 | /** |
1802 | * ieee80211_tx_status - transmit status callback | 1808 | * ieee80211_tx_status - transmit status callback |
1803 | * | 1809 | * |
diff --git a/include/net/tcp.h b/include/net/tcp.h index e2d2ca2509be..0248c181a92c 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1261,28 +1261,6 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu | |||
1261 | #define tcp_for_write_queue_from_safe(skb, tmp, sk) \ | 1261 | #define tcp_for_write_queue_from_safe(skb, tmp, sk) \ |
1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) | 1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) |
1263 | 1263 | ||
1264 | /* This function calculates a "timeout" which is equivalent to the timeout of a | ||
1265 | * TCP connection after "boundary" unsucessful, exponentially backed-off | ||
1266 | * retransmissions with an initial RTO of TCP_RTO_MIN. | ||
1267 | */ | ||
1268 | static inline bool retransmits_timed_out(const struct sock *sk, | ||
1269 | unsigned int boundary) | ||
1270 | { | ||
1271 | unsigned int timeout, linear_backoff_thresh; | ||
1272 | |||
1273 | if (!inet_csk(sk)->icsk_retransmits) | ||
1274 | return false; | ||
1275 | |||
1276 | linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN); | ||
1277 | |||
1278 | if (boundary <= linear_backoff_thresh) | ||
1279 | timeout = ((2 << boundary) - 1) * TCP_RTO_MIN; | ||
1280 | else | ||
1281 | timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN + | ||
1282 | (boundary - linear_backoff_thresh) * TCP_RTO_MAX; | ||
1283 | |||
1284 | return (tcp_time_stamp - tcp_sk(sk)->retrans_stamp) >= timeout; | ||
1285 | } | ||
1286 | 1264 | ||
1287 | static inline struct sk_buff *tcp_send_head(struct sock *sk) | 1265 | static inline struct sk_buff *tcp_send_head(struct sock *sk) |
1288 | { | 1266 | { |