diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/skbuff.h | 7 | ||||
-rw-r--r-- | include/net/bluetooth/hci.h | 6 | ||||
-rw-r--r-- | include/net/mac80211.h | 6 | ||||
-rw-r--r-- | include/net/phonet/gprs.h | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index b534a1be540..642cb7355df 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -225,14 +225,11 @@ enum { | |||
225 | /* device driver is going to provide hardware time stamp */ | 225 | /* device driver is going to provide hardware time stamp */ |
226 | SKBTX_IN_PROGRESS = 1 << 2, | 226 | SKBTX_IN_PROGRESS = 1 << 2, |
227 | 227 | ||
228 | /* ensure the originating sk reference is available on driver level */ | ||
229 | SKBTX_DRV_NEEDS_SK_REF = 1 << 3, | ||
230 | |||
231 | /* device driver supports TX zero-copy buffers */ | 228 | /* device driver supports TX zero-copy buffers */ |
232 | SKBTX_DEV_ZEROCOPY = 1 << 4, | 229 | SKBTX_DEV_ZEROCOPY = 1 << 3, |
233 | 230 | ||
234 | /* generate wifi status information (where possible) */ | 231 | /* generate wifi status information (where possible) */ |
235 | SKBTX_WIFI_STATUS = 1 << 5, | 232 | SKBTX_WIFI_STATUS = 1 << 4, |
236 | }; | 233 | }; |
237 | 234 | ||
238 | /* | 235 | /* |
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 66a7b579e31..3def64ba77f 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -1144,6 +1144,12 @@ struct extended_inquiry_info { | |||
1144 | __u8 data[240]; | 1144 | __u8 data[240]; |
1145 | } __packed; | 1145 | } __packed; |
1146 | 1146 | ||
1147 | #define HCI_EV_KEY_REFRESH_COMPLETE 0x30 | ||
1148 | struct hci_ev_key_refresh_complete { | ||
1149 | __u8 status; | ||
1150 | __le16 handle; | ||
1151 | } __packed; | ||
1152 | |||
1147 | #define HCI_EV_IO_CAPA_REQUEST 0x31 | 1153 | #define HCI_EV_IO_CAPA_REQUEST 0x31 |
1148 | struct hci_ev_io_capa_request { | 1154 | struct hci_ev_io_capa_request { |
1149 | bdaddr_t bdaddr; | 1155 | bdaddr_t bdaddr; |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 1937c7d9830..95e39b6a02e 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1940,6 +1940,11 @@ enum ieee80211_rate_control_changed { | |||
1940 | * to also unregister the device. If it returns 1, then mac80211 | 1940 | * to also unregister the device. If it returns 1, then mac80211 |
1941 | * will also go through the regular complete restart on resume. | 1941 | * will also go through the regular complete restart on resume. |
1942 | * | 1942 | * |
1943 | * @set_wakeup: Enable or disable wakeup when WoWLAN configuration is | ||
1944 | * modified. The reason is that device_set_wakeup_enable() is | ||
1945 | * supposed to be called when the configuration changes, not only | ||
1946 | * in suspend(). | ||
1947 | * | ||
1943 | * @add_interface: Called when a netdevice attached to the hardware is | 1948 | * @add_interface: Called when a netdevice attached to the hardware is |
1944 | * enabled. Because it is not called for monitor mode devices, @start | 1949 | * enabled. Because it is not called for monitor mode devices, @start |
1945 | * and @stop must be implemented. | 1950 | * and @stop must be implemented. |
@@ -2966,6 +2971,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, | |||
2966 | * ieee80211_generic_frame_duration - Calculate the duration field for a frame | 2971 | * ieee80211_generic_frame_duration - Calculate the duration field for a frame |
2967 | * @hw: pointer obtained from ieee80211_alloc_hw(). | 2972 | * @hw: pointer obtained from ieee80211_alloc_hw(). |
2968 | * @vif: &struct ieee80211_vif pointer from the add_interface callback. | 2973 | * @vif: &struct ieee80211_vif pointer from the add_interface callback. |
2974 | * @band: the band to calculate the frame duration on | ||
2969 | * @frame_len: the length of the frame. | 2975 | * @frame_len: the length of the frame. |
2970 | * @rate: the rate at which the frame is going to be transmitted. | 2976 | * @rate: the rate at which the frame is going to be transmitted. |
2971 | * | 2977 | * |
diff --git a/include/net/phonet/gprs.h b/include/net/phonet/gprs.h index 928daf595be..bcd525e39a0 100644 --- a/include/net/phonet/gprs.h +++ b/include/net/phonet/gprs.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2008 Nokia Corporation. | 6 | * Copyright (C) 2008 Nokia Corporation. |
7 | * | 7 | * |
8 | * Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 8 | * Author: Rémi Denis-Courmont |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or | 10 | * This program is free software; you can redistribute it and/or |
11 | * modify it under the terms of the GNU General Public License | 11 | * modify it under the terms of the GNU General Public License |