refresh generic 2.6.25 patches to match upstream style

SVN-Revision: 11296

1 files changed, 19 insertions, 31 deletions

diff --git a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
index 4312856a4c..81e10834e3 100644
--- a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ap.c
-+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2397,13 +2397,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
+@@ -2397,13 +2397,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.25.4/drivers/net/wireless/hostap/hostap_ap.c
  		qual[count].updated = sta->last_rx_updated;
  
  		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_
+@@ -2468,13 +2468,13 @@
  		memset(&iwe, 0, sizeof(iwe));
  		iwe.cmd = IWEVQUAL;
  		if (sta->last_rx_silence == 0)
@@ -42,10 +40,8 @@ Index: linux-2.6.25.4/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.25.4/drivers/net/wireless/hostap/hostap_config.h
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_config.h
-+++ linux-2.6.25.4/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.25.4/drivers/net/wireless/hostap/hostap_config.h
 +#define RAW_TXPOWER_SETTING
 +
  #endif /* HOSTAP_CONFIG_H */
-Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap.h
-+++ linux-2.6.25.4/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.25.4/drivers/net/wireless/hostap/hostap.h
  
  
  #endif /* HOSTAP_H */
-Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_hw.c
-+++ linux-2.6.25.4/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.25.4/drivers/net/wireless/hostap/hostap_hw.c
  	return res;
  }
  
-Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_info.c
-+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
-@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -434,6 +434,11 @@
  	}
  
  	/* Get BSSID if we have a valid AP address */
@@ -96,11 +86,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
  	if (connected) {
  		netif_carrier_on(local->dev);
  		netif_carrier_on(local->ddev);
-Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1500,23 +1500,20 @@
  		val = 255;
  
  	tmp = val;
@@ -128,7 +116,7 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
  
  	return (unsigned char) tmp;
  }
-@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,
+@@ -4076,3 +4073,35 @@
  
  	return ret;
  }