Let's clean up some of the whitespace use (extra lines, trailing
whitespace, incorrect indentation).
Signed-off-by: Jouni Malinen <[EMAIL PROTECTED]>
Index: wireless-2.6/net/d80211/ieee80211.c
===================================================================
--- wireless-2.6.orig/net/d80211/ieee80211.c
+++ wireless-2.6/net/d80211/ieee80211.c
@@ -322,8 +322,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
extra.startidx = 0;
extra.endidx = tx->local->num_curr_rates;
-
- tx->u.tx.rate = rate_control_get_rate(tx->dev, tx->skb, &extra);
+ tx->u.tx.rate = rate_control_get_rate(tx->dev, tx->skb, &extra);
if (unlikely(extra.probe != NULL)) {
tx->u.tx.control->rate_ctrl_probe = 1;
tx->u.tx.probe_last_frag = 1;
@@ -375,7 +374,8 @@ ieee80211_tx_h_select_key(struct ieee802
tx->key = tx->sta->key;
else if (tx->sdata->default_key)
tx->key = tx->sdata->default_key;
- else if (tx->sdata->drop_unencrypted && !(tx->sdata->eapol &&
ieee80211_is_eapol(tx->skb))) {
+ else if (tx->sdata->drop_unencrypted &&
+ !(tx->sdata->eapol && ieee80211_is_eapol(tx->skb))) {
I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
return TXRX_DROP;
} else
@@ -408,7 +408,6 @@ ieee80211_tx_h_fragment(struct ieee80211
if (!tx->fragmented)
return TXRX_CONTINUE;
-
first = tx->skb;
hdrlen = ieee80211_get_hdrlen(tx->fc);
@@ -755,7 +754,6 @@ ieee80211_tx_h_misc(struct ieee80211_txr
!control->use_rts_cts)
control->use_cts_protect = 1;
-
/* Setup duration field for the first fragment of the frame. Duration
* for remaining fragments will be updated when they are being sent
* to low-level driver in ieee80211_tx(). */
@@ -777,7 +775,6 @@ ieee80211_tx_h_misc(struct ieee80211_txr
!(rate->flags & IEEE80211_RATE_BASIC))
rate--;
-
if (control->use_rts_cts)
dur += ieee80211_frame_duration(tx->local, 10,
rate->rate, erp,
@@ -819,10 +816,10 @@ static void ieee80211_rate_limit(unsigne
local->rate_limit_bucket = local->rate_limit_burst;
local->rate_limit_timer.expires = jiffies + HZ;
add_timer(&local->rate_limit_timer);
- }
-
+ }
}
+
static ieee80211_txrx_result
ieee80211_tx_h_rate_limit(struct ieee80211_txrx_data *tx)
{
@@ -841,7 +838,6 @@ ieee80211_tx_h_rate_limit(struct ieee802
}
-
static ieee80211_txrx_result
ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
{
@@ -1220,7 +1216,8 @@ static int ieee80211_master_start_xmit(s
control.sdata = pkt_data->sdata;
control.req_tx_status = pkt_data->req_tx_status;
control.do_not_encrypt = pkt_data->do_not_encrypt;
- control.pkt_type = pkt_data->pkt_probe_resp ? PKT_PROBE_RESP :
PKT_NORMAL;
+ control.pkt_type =
+ pkt_data->pkt_probe_resp ? PKT_PROBE_RESP : PKT_NORMAL;
control.requeue = pkt_data->requeue;
control.queue = pkt_data->queue;
@@ -1324,7 +1321,7 @@ static int ieee80211_subif_start_xmit(st
ret = 0;
goto fail;
}
-
+
/* receiver is QoS enabled, use a QoS type frame */
sta = sta_info_get(local, hdr.addr1);
if (sta) {
@@ -1334,7 +1331,7 @@ static int ieee80211_subif_start_xmit(st
}
sta_info_release(local, sta);
}
-
+
hdr.frame_control = cpu_to_le16(fc);
hdr.duration_id = 0;
hdr.seq_ctrl = 0;
@@ -1423,10 +1420,9 @@ static int ieee80211_subif_start_xmit(st
skb->nh.raw = skb->data + nh_pos;
skb->h.raw = skb->data + h_pos;
+ dev_queue_xmit(skb);
- dev_queue_xmit(skb);
-
- return 0;
+ return 0;
fail:
if (!ret)
@@ -1459,7 +1455,7 @@ ieee80211_mgmt_start_xmit(struct sk_buff
hdr = (struct ieee80211_hdr *) skb->data;
fc = le16_to_cpu(hdr->frame_control);
- pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+ pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
pkt_data->sdata = sdata;
@@ -1467,7 +1463,7 @@ ieee80211_mgmt_start_xmit(struct sk_buff
WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_PROBE_RESP)
pkt_data->pkt_probe_resp = 1;
- skb->priority = 20; /* use hardcode priority for mgmt TX queue */
+ skb->priority = 20; /* use hardcoded priority for mgmt TX queue */
skb->dev = sdata->master;
/*
@@ -1480,8 +1476,6 @@ ieee80211_mgmt_start_xmit(struct sk_buff
hdr->frame_control = cpu_to_le16(fc);
}
-
-
pkt_data->do_not_encrypt = !(fc & WLAN_FC_ISWEP);
sdata->stats.tx_packets++;
@@ -1567,8 +1561,6 @@ static void ieee80211_beacon_add_tim(str
}
-
-
struct sk_buff * ieee80211_beacon_get(struct net_device *dev, int bss_idx,
struct ieee80211_tx_control *control)
{
@@ -1582,7 +1574,6 @@ struct sk_buff * ieee80211_beacon_get(st
u8 *b_head, *b_tail;
int bh_len, bt_len;
-
spin_lock_bh(&local->sub_if_lock);
if (bss_idx < 0 || bss_idx >= local->bss_dev_count)
bdev = NULL;
@@ -1608,7 +1599,6 @@ struct sk_buff * ieee80211_beacon_get(st
bh_len = ap->beacon_head_len;
bt_len = ap->beacon_tail_len;
-
skb = dev_alloc_skb(bh_len + bt_len + 256 /* maximum TIM len */);
if (!skb)
return NULL;
@@ -1624,7 +1614,6 @@ struct sk_buff * ieee80211_beacon_get(st
memset(&extra, 0, sizeof(extra));
extra.endidx = local->num_curr_rates;
-
rate = rate_control_get_rate(dev, skb, &extra);
if (rate == NULL) {
if (net_ratelimit()) {
@@ -1645,11 +1634,11 @@ struct sk_buff * ieee80211_beacon_get(st
control->rts_cts_duration = 0;
control->clear_dst_mask = 1;
-
ap->num_beacons++;
return skb;
}
+
struct sk_buff *
ieee80211_get_buffered_bc(struct net_device *dev, int bss_idx,
struct ieee80211_tx_control *control)
@@ -1664,7 +1653,6 @@ ieee80211_get_buffered_bc(struct net_dev
struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_ap *bss;
-
spin_lock_bh(&local->sub_if_lock);
if (bss_idx < 0 || bss_idx >= local->bss_dev_count) {
bdev = NULL;
@@ -1925,8 +1913,6 @@ static struct net_device * ieee80211_own
}
-
-
static struct net_device * ieee80211_sta_bssid(struct ieee80211_local *local,
u8 *addr, u8 *a1,
int *sta_multicast)
@@ -2120,8 +2106,8 @@ ieee80211_rx_h_data(struct ieee80211_txr
struct ethhdr *ehdr;
unsigned short len;
skb_pull(skb, hdrlen);
- len = htons(skb->len);
- ehdr = (struct ethhdr *)skb_push(skb, sizeof(struct ethhdr));
+ len = htons(skb->len);
+ ehdr = (struct ethhdr *) skb_push(skb, sizeof(struct ethhdr));
memcpy(ehdr->h_dest, dst, ETH_ALEN);
memcpy(ehdr->h_source, src, ETH_ALEN);
ehdr->h_proto = len;
@@ -3542,7 +3528,8 @@ static void ieee80211_tasklet_handler(un
memcpy(&rx_status, skb->cb, sizeof(rx_status));
if (!rx_status) {
if (net_ratelimit())
- printk(KERN_WARNING "%s: Not enough
memory, dropping packet",
+ printk(KERN_WARNING "%s: Not enough "
+ "memory, dropping packet",
skb->dev->name);
dev_kfree_skb(skb);
return;
@@ -3654,8 +3641,6 @@ void ieee80211_tx_status(struct net_devi
if (status->excessive_retries) {
struct sta_info *sta;
-
-
sta = sta_info_get(local, hdr->addr1);
if (sta) {
if (sta->flags & WLAN_STA_PS) {
@@ -3673,7 +3658,6 @@ void ieee80211_tx_status(struct net_devi
struct sta_info *sta;
sta = sta_info_get(local, hdr->addr1);
if (sta) {
-
sta->tx_filtered_count++;
/* Clear the TX filter mask for this STA when sending
@@ -3691,14 +3675,16 @@ void ieee80211_tx_status(struct net_devi
skb_queue_len(&sta->tx_filtered) <
STA_MAX_TX_BUFFER) {
ieee80211_remove_tx_extra(local, sta->key,
- skb,
&status->control);
+ skb,
+ &status->control);
skb_queue_tail(&sta->tx_filtered, skb);
} else if (!(sta->flags & WLAN_STA_PS) &&
!status->control.requeue) {
/* Software retry the packet once */
status->control.requeue = 1;
ieee80211_remove_tx_extra(local, sta->key,
- skb,
&status->control);
+ skb,
+ &status->control);
dev_queue_xmit(skb);
} else {
if (net_ratelimit()) {
@@ -3943,7 +3929,6 @@ int ieee80211_if_add_wds(struct net_devi
wds_dev->name, MAC2STR(sdata->u.wds.remote_addr));
#endif /* CONFIG_D80211_VERBOSE_DEBUG */
-
ieee80211_proc_init_virtual(wds_dev);
return 0;
@@ -3985,8 +3970,7 @@ int ieee80211_if_update_wds(struct net_d
/* Update WDS link data */
memcpy(&sdata->u.wds, wds, sizeof(struct ieee80211_if_wds));
-
- return 0;
+ return 0;
}
@@ -3996,14 +3980,11 @@ static void ieee80211_if_init(struct net
spin_lock_init(&local->sub_if_lock);
INIT_LIST_HEAD(&local->sub_if_list);
-
}
-int ieee80211_if_add_vlan(struct net_device *dev,
- const char *name,
- struct ieee80211_if_vlan *vlan,
- int locked)
+int ieee80211_if_add_vlan(struct net_device *dev, const char *name,
+ struct ieee80211_if_vlan *vlan, int locked)
{
struct net_device *vlan_dev = NULL;
struct ieee80211_sub_if_data *sdata = NULL;
@@ -4293,28 +4274,32 @@ static int ieee80211_if_remove(struct ne
}
-int ieee80211_if_remove_wds(struct net_device *dev, const char *name, int
locked)
+int ieee80211_if_remove_wds(struct net_device *dev, const char *name,
+ int locked)
{
return ieee80211_if_remove(dev, name, IEEE80211_SUB_IF_TYPE_WDS,
locked);
}
-int ieee80211_if_remove_vlan(struct net_device *dev, const char *name, int
locked)
+int ieee80211_if_remove_vlan(struct net_device *dev, const char *name,
+ int locked)
{
return ieee80211_if_remove(dev, name, IEEE80211_SUB_IF_TYPE_VLAN,
locked);
}
-int ieee80211_if_remove_ap(struct net_device *dev, const char *name, int
locked)
+int ieee80211_if_remove_ap(struct net_device *dev, const char *name,
+ int locked)
{
return ieee80211_if_remove(dev, name, IEEE80211_SUB_IF_TYPE_AP,
locked);
}
-int ieee80211_if_remove_sta(struct net_device *dev, const char *name, int
locked)
+int ieee80211_if_remove_sta(struct net_device *dev, const char *name,
+ int locked)
{
return ieee80211_if_remove(dev, name, IEEE80211_SUB_IF_TYPE_STA,
locked);
@@ -4546,6 +4531,7 @@ struct net_device *ieee80211_alloc_hw(si
return NULL;
}
+
int ieee80211_register_hw(struct net_device *dev, struct ieee80211_hw *hw)
{
struct ieee80211_local *local = dev->priv;
@@ -4659,6 +4645,7 @@ int ieee80211_update_hw(struct net_devic
return 0;
}
+
void ieee80211_unregister_hw(struct net_device *dev)
{
struct ieee80211_local *local = dev->priv;
@@ -4718,6 +4705,7 @@ void ieee80211_free_hw(struct net_device
kfree(dev);
}
+
/* Perform netif operations on all configured interfaces */
int ieee80211_netif_oper(struct net_device *sdev, Netif_Oper op)
{
@@ -4725,19 +4713,19 @@ int ieee80211_netif_oper(struct net_devi
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(sdev);
struct net_device *dev = sdata->master;
- switch (op) {
- case NETIF_ATTACH:
- netif_device_attach(dev);
- break;
- case NETIF_DETACH:
- netif_device_detach(dev);
- break;
- case NETIF_START:
- netif_start_queue(dev);
- break;
- case NETIF_STOP:
- break;
- case NETIF_WAKE:
+ switch (op) {
+ case NETIF_ATTACH:
+ netif_device_attach(dev);
+ break;
+ case NETIF_DETACH:
+ netif_device_detach(dev);
+ break;
+ case NETIF_START:
+ netif_start_queue(dev);
+ break;
+ case NETIF_STOP:
+ break;
+ case NETIF_WAKE:
if (local->scan.in_scan == 0) {
netif_wake_queue(dev);
#if 1
@@ -4745,15 +4733,15 @@ int ieee80211_netif_oper(struct net_devi
__netif_schedule(dev);
#endif
}
- break;
- case NETIF_IS_STOPPED:
- if (netif_queue_stopped(dev))
- return 1;
- break;
- case NETIF_UPDATE_TX_START:
- dev->trans_start = jiffies;
- break;
- }
+ break;
+ case NETIF_IS_STOPPED:
+ if (netif_queue_stopped(dev))
+ return 1;
+ break;
+ case NETIF_UPDATE_TX_START:
+ dev->trans_start = jiffies;
+ break;
+ }
return 0;
}
@@ -4849,7 +4837,8 @@ static int __init ieee80211_init(void)
return -EINVAL;
}
if ((ret = ieee80211_sysfs_init())) {
- printk(KERN_WARNING "ieee80211_init: sysfs initialization
failed\n");
+ printk(KERN_WARNING "ieee80211_init: sysfs initialization "
+ "failed\n");
return ret;
}
Index: wireless-2.6/net/d80211/hostapd_ioctl.h
===================================================================
--- wireless-2.6.orig/net/d80211/hostapd_ioctl.h
+++ wireless-2.6/net/d80211/hostapd_ioctl.h
@@ -184,7 +184,7 @@ struct prism2_hostapd_param {
u16 capability;
u8 supp_rates[32];
/* atheros_super_ag and enc_flags are only used with
- * IEEE80211_ATHEROS_SUPER_AG
+ * IEEE80211_ATHEROS_SUPER_AG
*/
u8 atheros_super_ag;
u8 atheros_xr_mode;
@@ -296,8 +296,8 @@ struct prism2_hostapd_param {
u16 mode; /* MODE_* */
u16 chan;
u32 flag;
- u8 power_level; /* regulatory limit in dBm */
- u8 antenna_max;
+ u8 power_level; /* regulatory limit in dBm */
+ u8 antenna_max;
} set_channel_flag;
struct {
u32 rd;
@@ -341,16 +341,16 @@ struct prism2_hostapd_param {
u8 pulse_height_threshold;
u8 pulse_rssi_threshold;
u8 pulse_inband_threshold;
- }radar;
+ } radar;
struct {
unsigned int period;
unsigned int offset;
unsigned int duration;
- }quiet;
+ } quiet;
struct {
unsigned int tx_power_min;
unsigned int tx_power_max;
- }tx_power;
+ } tx_power;
struct {
u8 dummy[80]; /* Make sizeof() this struct large enough
* with some compiler versions. */
Index: wireless-2.6/net/d80211/ieee80211_i.h
===================================================================
--- wireless-2.6.orig/net/d80211/ieee80211_i.h
+++ wireless-2.6/net/d80211/ieee80211_i.h
@@ -505,9 +505,8 @@ void ieee80211_rx_mgmt(struct net_device
struct ieee80211_rx_status *status, u32 msg_type);
void ieee80211_prepare_rates(struct net_device *dev);
void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx);
-int ieee80211_if_add_wds(struct net_device *dev,
- const char *name,
- struct ieee80211_if_wds *wds, int locked);
+int ieee80211_if_add_wds(struct net_device *dev, const char *name,
+ struct ieee80211_if_wds *wds, int locked);
int ieee80211_if_add_vlan(struct net_device *dev, const char *name,
struct ieee80211_if_vlan *vlan, int locked);
int ieee80211_if_add_ap(struct net_device *dev, const char *name, u8 *bssid,
Index: wireless-2.6/net/d80211/ieee80211_ioctl.c
===================================================================
--- wireless-2.6.orig/net/d80211/ieee80211_ioctl.c
+++ wireless-2.6/net/d80211/ieee80211_ioctl.c
@@ -76,7 +76,7 @@ static int ieee80211_ioctl_set_beacon(st
b_tail_len = &ap->beacon_tail_len;
break;
default:
- printk(KERN_DEBUG "%s: unknown beacon flag %d\n",
+ printk(KERN_DEBUG "%s: unknown beacon flag %d\n",
dev->name, flag);
return -EINVAL;
}
@@ -85,7 +85,7 @@ static int ieee80211_ioctl_set_beacon(st
kfree(*b_tail);
*b_head = NULL;
*b_tail = NULL;
-
+
*b_head_len = param->u.beacon.head_len;
*b_tail_len = param->u.beacon.tail_len;
@@ -174,8 +174,8 @@ static int ieee80211_ioctl_scan(struct n
if (local->hw->passive_scan == NULL)
return -EOPNOTSUPP;
- if ((param->u.scan.now == 1) && (local->scan.in_scan == 1))
- return -EBUSY;
+ if ((param->u.scan.now == 1) && (local->scan.in_scan == 1))
+ return -EBUSY;
if (param->u.scan.our_mode_only >= 0)
local->scan.our_mode_only = param->u.scan.our_mode_only;
@@ -193,12 +193,12 @@ static int ieee80211_ioctl_scan(struct n
param->u.scan.our_mode_only = local->scan.our_mode_only;
param->u.scan.interval = local->scan.interval;
param->u.scan.listen = local->scan.time;
- if (local->scan.in_scan == 1)
- param->u.scan.last_rx = -1;
- else {
- param->u.scan.last_rx = local->scan.rx_packets;
- local->scan.rx_packets = -1;
- }
+ if (local->scan.in_scan == 1)
+ param->u.scan.last_rx = -1;
+ else {
+ param->u.scan.last_rx = local->scan.rx_packets;
+ local->scan.rx_packets = -1;
+ }
param->u.scan.channel = local->hw->modes[local->scan.mode_idx].
channels[local->scan.chan_idx].chan;
@@ -215,8 +215,6 @@ static int ieee80211_ioctl_flush(struct
}
-
-
static int ieee80211_ioctl_add_sta(struct net_device *dev,
struct prism2_hostapd_param *param)
{
@@ -274,8 +272,6 @@ static int ieee80211_ioctl_add_sta(struc
rate_control_rate_init(local, sta);
-
-
if (param->u.add_sta.wds_flags & 0x01)
sta->flags |= WLAN_STA_WDS;
else
@@ -351,6 +347,7 @@ static int ieee80211_ioctl_get_dot11coun
return 0;
}
+
static int ieee80211_ioctl_get_info_sta(struct net_device *dev,
struct prism2_hostapd_param *param)
{
@@ -360,18 +357,18 @@ static int ieee80211_ioctl_get_info_sta(
if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
- struct ieee80211_sub_if_data *sdata;
- struct net_device_stats *stats;
+ struct ieee80211_sub_if_data *sdata;
+ struct net_device_stats *stats;
- sdata = IEEE80211_DEV_TO_SUB_IF(dev);
- stats = ieee80211_dev_stats(sdata->master);
- param->u.get_info_sta.rx_bytes = stats->rx_bytes;
- param->u.get_info_sta.tx_bytes = stats->tx_bytes;
- /* go through all STAs and get STA with lowest max. rate */
- param->u.get_info_sta.current_tx_rate =
- local->curr_rates[sta_info_min_txrate_get(local)].rate;
- return 0;
- }
+ sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ stats = ieee80211_dev_stats(sdata->master);
+ param->u.get_info_sta.rx_bytes = stats->rx_bytes;
+ param->u.get_info_sta.tx_bytes = stats->tx_bytes;
+ /* go through all STAs and get STA with lowest max. rate */
+ param->u.get_info_sta.current_tx_rate =
+ local->curr_rates[sta_info_min_txrate_get(local)].rate;
+ return 0;
+ }
sta = sta_info_get(local, param->sta_addr);
@@ -574,7 +571,6 @@ static int ieee80211_set_encryption(stru
}
}
-
if (alg == ALG_NONE) {
keyconf = NULL;
if (try_hwaccel && *key && local->hw->set_key &&
@@ -743,7 +739,6 @@ static int ieee80211_ioctl_get_encryptio
key = &sta->key;
}
-
memset(param->u.crypt.seq_counter, 0, HOSTAP_SEQ_COUNTER_SIZE);
if (*key == NULL) {
memcpy(param->u.crypt.alg, "none", 5);
@@ -1451,7 +1446,7 @@ static int ieee80211_ioctl_priv_hostapd(
ret = ieee80211_ioctl_flush_ifs(dev, param);
break;
case PRISM2_HOSTAPD_SET_RADAR_PARAMS:
- ret = ieee80211_ioctl_set_radar_params(dev, param);
+ ret = ieee80211_ioctl_set_radar_params(dev, param);
break;
case PRISM2_HOSTAPD_SET_QUIET_PARAMS:
ret = ieee80211_ioctl_set_quiet_params(dev, param);
@@ -1917,7 +1912,7 @@ static int ieee80211_ioctl_siwrts(struct
if (local->hw->set_rts_threshold) {
local->hw->set_rts_threshold(dev, local->rts_threshold);
}
-
+
return 0;
}
@@ -1958,7 +1953,7 @@ static int ieee80211_ioctl_siwfrag(struc
local->hw->set_frag_threshold(
dev, local->fragmentation_threshold);
}
-
+
return 0;
}
@@ -2106,7 +2101,6 @@ static int ieee80211_ioctl_clear_keys(st
}
spin_unlock_bh(&local->sta_lock);
-
memset(&key, 0, sizeof(key));
if (local->hw->set_key &&
local->hw->set_key(dev, REMOVE_ALL_KEYS, NULL,
@@ -2436,8 +2430,6 @@ static int ieee80211_ioctl_prism2_param(
local->wifi_wme_noack_test = value;
break;
-
-
case PRISM2_PARAM_ALLOW_BROADCAST_ALWAYS:
local->allow_broadcast_always = value;
break;
@@ -2623,8 +2615,6 @@ static int ieee80211_ioctl_get_prism2_pa
*param = local->wifi_wme_noack_test;
break;
-
-
case PRISM2_PARAM_ALLOW_BROADCAST_ALWAYS:
*param = local->allow_broadcast_always;
break;
Index: wireless-2.6/net/d80211/ieee80211_sta.c
===================================================================
--- wireless-2.6.orig/net/d80211/ieee80211_sta.c
+++ wireless-2.6/net/d80211/ieee80211_sta.c
@@ -390,7 +390,7 @@ static void ieee80211_set_associated(str
static void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb,
int encrypt, int probe_resp)
{
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
struct ieee80211_tx_packet_data *pkt_data;
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -731,7 +731,7 @@ static void ieee80211_associated(struct
}
sta_info_release(local, sta);
}
- if (disassoc) {
+ if (disassoc) {
union iwreq_data wrqu;
memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
@@ -1435,7 +1435,6 @@ static void ieee80211_rx_bss_info(struct
/* No matching rates - this should not really happen.
* Make sure that at least one rate is marked
* supported to avoid issues with TX rate ctrl. */
-
sta->supp_rates = sdata->u.sta.supp_rates_bits;
}
if (sta->supp_rates != prev_rates) {
@@ -1713,7 +1712,7 @@ static void ieee80211_rx_mgmt_probe_req(
void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb,
struct ieee80211_rx_status *rx_status)
{
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_sta *ifsta;
struct ieee80211_mgmt *mgmt;
u16 fc;
@@ -1862,7 +1861,7 @@ static void ieee80211_sta_merge_ibss(str
void ieee80211_sta_timer(unsigned long ptr)
{
struct net_device *dev;
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_sta *ifsta;
dev = (struct net_device *) ptr;
@@ -1980,7 +1979,7 @@ static int ieee80211_sta_join_ibss(struc
struct ieee80211_rate *rate;
struct rate_control_extra extra;
u8 *pos;
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
/* Remove possible STA entries from other IBSS networks. */
sta_info_flush(local, NULL);
@@ -2132,7 +2131,7 @@ static int ieee80211_sta_create_ibss(str
{
struct ieee80211_local *local = dev->priv;
struct ieee80211_sta_bss *bss;
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
u8 bssid[ETH_ALEN], *pos;
int i;
@@ -2236,7 +2235,7 @@ static int ieee80211_sta_find_ibss(struc
#endif /* IEEE80211_IBSS_DEBUG */
/* Selected IBSS not found in current scan results - try to scan */
- if (ifsta->state == IEEE80211_IBSS_JOINED &&
+ if (ifsta->state == IEEE80211_IBSS_JOINED &&
!ieee80211_sta_active_ibss(dev)) {
mod_timer(&ifsta->timer,
jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
@@ -2277,7 +2276,7 @@ static int ieee80211_sta_find_ibss(struc
int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len)
{
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_sta *ifsta;
struct ieee80211_local *local = dev->priv;
@@ -2334,7 +2333,7 @@ int ieee80211_sta_set_ssid(struct net_de
int ieee80211_sta_get_ssid(struct net_device *dev, char *ssid, size_t *len)
{
- struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_if_sta *ifsta = &sdata->u.sta;
memcpy(ssid, ifsta->ssid, ifsta->ssid_len);
*len = ifsta->ssid_len;
@@ -2345,7 +2344,7 @@ int ieee80211_sta_get_ssid(struct net_de
int ieee80211_sta_set_bssid(struct net_device *dev, u8 *bssid)
{
struct ieee80211_local *local = dev->priv;
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_sta *ifsta;
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -2757,7 +2756,7 @@ int ieee80211_sta_scan_results(struct ne
int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
{
- struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_if_sta *ifsta = &sdata->u.sta;
kfree(ifsta->extra_ie);
if (len == 0) {
Index: wireless-2.6/net/d80211/fifo_qdisc.c
===================================================================
--- wireless-2.6.orig/net/d80211/fifo_qdisc.c
+++ wireless-2.6/net/d80211/fifo_qdisc.c
@@ -26,12 +26,12 @@ static int pfifo_enqueue(struct sk_buff
kfree_skb(skb);
return NET_XMIT_DROP;
}
-
+
skb_queue_tail(q, skb);
qd->q.qlen++;
qd->bstats.bytes += skb->len;
qd->bstats.packets++;
-
+
return NET_XMIT_SUCCESS;
}
@@ -44,7 +44,7 @@ static int pfifo_requeue(struct sk_buff
qd->q.qlen++;
qd->bstats.bytes += skb->len;
qd->bstats.packets++;
-
+
return NET_XMIT_SUCCESS;
}
Index: wireless-2.6/net/d80211/ieee80211_scan.c
===================================================================
--- wireless-2.6.orig/net/d80211/ieee80211_scan.c
+++ wireless-2.6/net/d80211/ieee80211_scan.c
@@ -30,7 +30,7 @@ static void get_channel_params(struct ie
struct ieee80211_channel **chan)
{
int m;
-
+
for (m = 0; m < local->hw->num_modes; m++) {
*mode = &local->hw->modes[m];
if ((*mode)->mode == local->conf.phymode)
@@ -250,7 +250,7 @@ static void ieee80211_scan_stop(struct n
wait = (local->scan.interval * HZ * ((net_random() & 127) + 128)) /
128;
local->scan.timer.expires = jiffies + wait;
-
+
add_timer(&local->scan.timer);
}
Index: wireless-2.6/net/d80211/wep.c
===================================================================
--- wireless-2.6.orig/net/d80211/wep.c
+++ wireless-2.6/net/d80211/wep.c
@@ -136,7 +136,7 @@ u8 * ieee80211_wep_add_iv(struct ieee802
}
hdrlen = ieee80211_get_hdrlen(fc);
- newhdr = skb_push(skb, WEP_IV_LEN);
+ newhdr = skb_push(skb, WEP_IV_LEN);
memmove(newhdr, newhdr + WEP_IV_LEN, hdrlen);
ieee80211_wep_get_iv(local, key, newhdr + hdrlen);
return newhdr + hdrlen;
Index: wireless-2.6/net/d80211/wme.c
===================================================================
--- wireless-2.6.orig/net/d80211/wme.c
+++ wireless-2.6/net/d80211/wme.c
@@ -119,7 +119,7 @@ static inline unsigned classify_1d(struc
* from VLAN tags, etc. */
if (skb->priority >= 256 && skb->priority <= 263)
return skb->priority - 256;
-
+
/* check there is a valid IP header present */
offset = ieee80211_get_hdrlen_from_skb(skb) + 8 /* LLC + proto */;
if (skb->protocol != __constant_htons(ETH_P_IP) ||
@@ -150,8 +150,6 @@ static inline unsigned classify_1d(struc
}
-
-
static inline int wme_downgrade_ac(struct sk_buff *skb)
{
switch (skb->priority) {
@@ -173,7 +171,7 @@ static inline int wme_downgrade_ac(struc
}
-/* positive return value indicates which queue to use
+/* positive return value indicates which queue to use
* negative return value indicates to drop the frame */
static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd)
{
@@ -184,14 +182,14 @@ static inline int classify80211(struct s
unsigned short fc = le16_to_cpu(hdr->frame_control);
int qos;
const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
-
+
/* see if frame is data or non data frame */
if (unlikely(WLAN_FC_GET_TYPE(fc) != WLAN_FC_TYPE_DATA)) {
/* management frames go on AC_VO queue, but are sent
* without QoS control fields */
return IEEE80211_TX_QUEUE_DATA0;
}
-
+
if (unlikely(pkt_data->sdata->type == IEEE80211_SUB_IF_TYPE_MGMT)) {
/* Data frames from hostapd (mainly, EAPOL) use AC_VO
* and they will include QoS control fields if
@@ -199,21 +197,18 @@ static inline int classify80211(struct s
skb->priority = 7;
return ieee802_1d_to_ac[skb->priority];
}
-
/* is this a QoS frame? */
qos = fc & (WLAN_FC_STYPE_QOS_DATA << 4);
-
if (!qos) {
skb->priority = 0; /* required for correct WPA/11i MIC */
return ieee802_1d_to_ac[skb->priority];
}
-
+
/* use the data classifier to determine what 802.1d tag the
* data frame has */
skb->priority = classify_1d(skb, qd);
-
/* incase we are a client verify acm is not set for this ac */
for (; unlikely(local->wmm_acm & BIT(skb->priority)); )
@@ -224,7 +219,7 @@ static inline int classify80211(struct s
return -1;
}
}
-
+
/* look up which queue to use for frames with this 1d tag */
return ieee802_1d_to_ac[skb->priority];
}
@@ -247,12 +242,15 @@ static int wme_qdiscop_enqueue(struct sk
}
queue = classify80211(skb, qd);
-
- /* now we know the 1d priority, fill in the QoS header if there is one
*/
+
+ /* now we know the 1d priority, fill in the QoS header if there is one
+ */
if (WLAN_FC_IS_QOS_DATA(fc)) {
- struct qos_control *qc = (struct qos_control *) (skb->data +
ieee80211_get_hdrlen(fc) - 2);
+ struct qos_control *qc = (struct qos_control *)
+ (skb->data + ieee80211_get_hdrlen(fc) - 2);
u8 *p = (u8 *) qc;
- *p++ = 0; /* do this due to gcc's lack of optimization on
bitfield ops */
+ *p++ = 0; /* do this due to gcc's lack of optimization on
+ * bitfield ops */
*p = 0;
qc->tag1d = skb->priority;
if (local->wifi_wme_noack_test)
@@ -269,7 +267,7 @@ static int wme_qdiscop_enqueue(struct sk
#endif
queue = local->hw->queues - 1;
}
-
+
if (unlikely(queue < 0)) {
kfree_skb(skb);
err = NET_XMIT_DROP;
@@ -290,7 +288,7 @@ static int wme_qdiscop_enqueue(struct sk
/* TODO: clean up the cases where master_hard_start_xmit
- * returns non 0 - it shouldn't ever do that. Once done we
+ * returns non 0 - it shouldn't ever do that. Once done we
* can remove this function */
static int wme_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
{
@@ -397,7 +395,7 @@ static int wme_qdiscop_tune(struct Qdisc
/* copy any options to our local structure */
/* Ignore options block for now - always use static mapping
struct tc_ieee80211_qopt *qopt = RTA_DATA(opt);
-
+
if (opt->rta_len < RTA_LENGTH(sizeof(*qopt)))
return -EINVAL;
memcpy(q->tag2queue, qopt->tag2queue, sizeof(qopt->tag2queue));
@@ -414,7 +412,7 @@ static int wme_qdiscop_init(struct Qdisc
struct ieee80211_local *local = dev->priv;
int queues = local->hw->queues;
int err = 0, i;
-
+
/* check this device is an ieee80211 master type device */
if (dev->type != ARPHRD_IEEE80211)
return -EINVAL;
@@ -667,7 +665,7 @@ void ieee80211_install_qdisc(struct net_
printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
return;
}
-
+
/* same handle as would be allocated by qdisc_alloc_handle() */
qdisc->handle = 0x80010000;
--
--
Jouni Malinen PGP id EFC895FA
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
