diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 05:10:26 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 05:10:26 +0200 |
| commit | 20445cc9159089d9d6b88d7864578efb10eb6590 (patch) | |
| tree | fbbb27fd8baa82c77ebc4e020e8ee9ddb57e3ae2 /include/net | |
| parent | [PATCH] hostap: Use ieee80211 WLAN_FC_GET_{TYPE,STYPE} (diff) | |
| parent | Merge /spare/repo/linux-2.6/ (diff) | |
| download | linux-20445cc9159089d9d6b88d7864578efb10eb6590.tar.xz linux-20445cc9159089d9d6b88d7864578efb10eb6590.zip | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 8 | ||||
| -rw-r--r-- | include/net/ieee80211.h | 2 | ||||
| -rw-r--r-- | include/net/tcp.h | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 42a84c53678b..06b24f637026 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -57,12 +57,6 @@ #define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg) #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg) -#ifdef HCI_DATA_DUMP -#define BT_DMP(buf, len) bt_dump(__FUNCTION__, buf, len) -#else -#define BT_DMP(D...) -#endif - extern struct proc_dir_entry *proc_bt; /* Connection and socket states */ @@ -174,8 +168,6 @@ static inline int skb_frags_no(struct sk_buff *skb) return n; } -void bt_dump(char *pref, __u8 *buf, int count); - int bt_err(__u16 code); #endif /* __BLUETOOTH_H */ diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 1cf7ca0b6182..11524c9b659a 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -104,7 +104,7 @@ struct eapol { #define MAX_FRAG_THRESHOLD 2346U /* Frame control field constants */ -#define IEEE80211_FCTL_VERS 0x0002 +#define IEEE80211_FCTL_VERS 0x0003 #define IEEE80211_FCTL_FTYPE 0x000c #define IEEE80211_FCTL_STYPE 0x00f0 #define IEEE80211_FCTL_TODS 0x0100 diff --git a/include/net/tcp.h b/include/net/tcp.h index f4f9aba07ac2..5010f0c5a56e 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1236,7 +1236,7 @@ static inline void tcp_sync_left_out(struct tcp_sock *tp) tp->left_out = tp->sacked_out + tp->lost_out; } -/* Set slow start threshould and cwnd not falling to slow start */ +/* Set slow start threshold and cwnd not falling to slow start */ static inline void __tcp_enter_cwr(struct tcp_sock *tp) { tp->undo_marker = 0; |