mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
refresh generic 2.6.24 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11302 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_ap.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
@@ -2358,13 +2358,13 @@ int prism2_ap_get_sta_qual(local_info_t
|
||||
--- a/drivers/net/wireless/hostap/hostap_ap.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_ap.c
|
||||
@@ -2358,13 +2358,13 @@
|
||||
addr[count].sa_family = ARPHRD_ETHER;
|
||||
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
|
||||
if (sta->last_rx_silence == 0)
|
||||
@@ -22,7 +20,7 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
qual[count].updated = sta->last_rx_updated;
|
||||
|
||||
sta->last_rx_updated = IW_QUAL_DBM;
|
||||
@@ -2429,13 +2429,13 @@ int prism2_ap_translate_scan(struct net_
|
||||
@@ -2429,13 +2429,13 @@
|
||||
memset(&iwe, 0, sizeof(iwe));
|
||||
iwe.cmd = IWEVQUAL;
|
||||
if (sta->last_rx_silence == 0)
|
||||
@@ -42,10 +40,8 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
iwe.u.qual.updated = sta->last_rx_updated;
|
||||
iwe.len = IW_EV_QUAL_LEN;
|
||||
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
|
||||
Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_config.h
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
--- a/drivers/net/wireless/hostap/hostap_config.h
|
||||
+++ b/drivers/net/wireless/hostap/hostap_config.h
|
||||
@@ -45,4 +45,9 @@
|
||||
*/
|
||||
/* #define PRISM2_NO_STATION_MODES */
|
||||
@@ -56,11 +52,9 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
+#define RAW_TXPOWER_SETTING
|
||||
+
|
||||
#endif /* HOSTAP_CONFIG_H */
|
||||
Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap.h
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap.h
|
||||
@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
|
||||
--- a/drivers/net/wireless/hostap/hostap.h
|
||||
+++ b/drivers/net/wireless/hostap/hostap.h
|
||||
@@ -89,6 +89,7 @@
|
||||
extern const struct ethtool_ops prism2_ethtool_ops;
|
||||
|
||||
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
|
||||
@@ -68,11 +62,9 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap.h
|
||||
|
||||
|
||||
#endif /* HOSTAP_H */
|
||||
Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_hw.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
|
||||
--- a/drivers/net/wireless/hostap/hostap_hw.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_hw.c
|
||||
@@ -933,6 +933,7 @@
|
||||
prism2_hw_reset(dev);
|
||||
}
|
||||
|
||||
@@ -80,11 +72,9 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
return res;
|
||||
}
|
||||
|
||||
Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_info.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus
|
||||
--- a/drivers/net/wireless/hostap/hostap_info.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_info.c
|
||||
@@ -433,6 +433,11 @@
|
||||
}
|
||||
|
||||
/* Get BSSID if we have a valid AP address */
|
||||
@@ -96,11 +86,9 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
if (connected) {
|
||||
netif_carrier_on(local->dev);
|
||||
netif_carrier_on(local->ddev);
|
||||
Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
+++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
@@ -1501,23 +1501,20 @@ static int prism2_txpower_hfa386x_to_dBm
|
||||
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
@@ -1501,23 +1501,20 @@
|
||||
val = 255;
|
||||
|
||||
tmp = val;
|
||||
@@ -128,7 +116,7 @@ Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
|
||||
return (unsigned char) tmp;
|
||||
}
|
||||
@@ -4077,3 +4074,35 @@ int hostap_ioctl(struct net_device *dev,
|
||||
@@ -4077,3 +4074,35 @@
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user