generic-2.6/2.6.21: refresh patches
SVN-Revision: 14453
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_ap.c
|
||||
+++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ap.c
|
||||
--- a/drivers/net/wireless/hostap/hostap_ap.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_ap.c
|
||||
@@ -2346,13 +2346,13 @@ int prism2_ap_get_sta_qual(local_info_t
|
||||
addr[count].sa_family = ARPHRD_ETHER;
|
||||
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
|
||||
@@ -42,10 +40,8 @@ Index: linux-2.6.21.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.21.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_config.h
|
||||
+++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
--- a/drivers/net/wireless/hostap/hostap_config.h
|
||||
+++ b/drivers/net/wireless/hostap/hostap_config.h
|
||||
@@ -47,4 +47,9 @@
|
||||
*/
|
||||
/* #define PRISM2_NO_STATION_MODES */
|
||||
@@ -56,10 +52,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_config.h
|
||||
+#define RAW_TXPOWER_SETTING
|
||||
+
|
||||
#endif /* HOSTAP_CONFIG_H */
|
||||
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap.h
|
||||
+++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h
|
||||
--- a/drivers/net/wireless/hostap/hostap.h
|
||||
+++ b/drivers/net/wireless/hostap/hostap.h
|
||||
@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
|
||||
extern const struct ethtool_ops prism2_ethtool_ops;
|
||||
|
||||
@@ -68,10 +62,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap.h
|
||||
|
||||
|
||||
#endif /* HOSTAP_H */
|
||||
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_hw.c
|
||||
+++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
--- a/drivers/net/wireless/hostap/hostap_hw.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_hw.c
|
||||
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
|
||||
prism2_hw_reset(dev);
|
||||
}
|
||||
@@ -80,10 +72,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_hw.c
|
||||
return res;
|
||||
}
|
||||
|
||||
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_info.c
|
||||
+++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
--- a/drivers/net/wireless/hostap/hostap_info.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_info.c
|
||||
@@ -428,6 +428,11 @@ static void handle_info_queue_linkstatus
|
||||
}
|
||||
|
||||
@@ -96,10 +86,8 @@ Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_info.c
|
||||
if (connected) {
|
||||
netif_carrier_on(local->dev);
|
||||
netif_carrier_on(local->ddev);
|
||||
Index: linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
+++ linux-2.6.21.7/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
|
||||
@@ -1504,23 +1504,20 @@ static int prism2_txpower_hfa386x_to_dBm
|
||||
val = 255;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user