r166 - unstable/rt73/debian/patches
Ben Hutchings
benh at alioth.debian.org
Wed Apr 8 01:44:18 UTC 2009
Author: benh
Date: 2009-04-08 01:44:18 +0000 (Wed, 08 Apr 2009)
New Revision: 166
Added:
unstable/rt73/debian/patches/004_use_netdev_functions.diff
Modified:
unstable/rt73/debian/patches/series
Log:
Use proper function to get private data from net_device (the priv member was removed in 2.6.29).
Use proper function to free the net_device.
Added: unstable/rt73/debian/patches/004_use_netdev_functions.diff
===================================================================
--- unstable/rt73/debian/patches/004_use_netdev_functions.diff (rev 0)
+++ unstable/rt73/debian/patches/004_use_netdev_functions.diff 2009-04-08 01:44:18 UTC (rev 166)
@@ -0,0 +1,303 @@
+Use proper function to get private data from net_device (the priv member
+was removed in 2.6.29).
+Use proper function to free the net_device.
+
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_info.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_info.c
+@@ -177,7 +177,7 @@
+ struct iw_request_info *info,
+ struct iw_freq *freq, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ int chan = -1;
+
+ //check if the interface is down
+@@ -208,7 +208,7 @@
+ struct iw_request_info *info,
+ struct iw_freq *freq, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ ULONG m;
+
+ //check if the interface is down
+@@ -228,7 +228,7 @@
+ struct iw_request_info *info,
+ __u32 *mode, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -302,7 +302,7 @@
+ struct iw_request_info *info,
+ __u32 *mode, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -330,7 +330,7 @@
+ struct iw_request_info *info,
+ char *name, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -343,7 +343,7 @@
+ struct iw_request_info *info,
+ char *name, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -356,7 +356,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ struct iw_range *range = (struct iw_range *) extra;
+ u16 val;
+ int i, chan;
+@@ -462,7 +462,7 @@
+ struct sockaddr *ap_addr, char *extra)
+ {
+
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -540,7 +540,7 @@
+ struct iw_point *data, char *extra)
+ {
+
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ struct sockaddr addr[IW_MAX_AP];
+ struct iw_quality qual[IW_MAX_AP];
+ int i;
+@@ -571,7 +571,7 @@
+ struct iw_point *data, char *extra)
+ {
+ ULONG Now;
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ int Status = NDIS_STATUS_SUCCESS;
+ //BOOLEAN StateMachineTouched = FALSE;
+
+@@ -639,7 +639,7 @@
+ struct iw_point *data, char *extra)
+ {
+
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ int i=2, j;
+ char *current_ev = extra, *previous_ev = extra;
+ char *end_buf = extra + IW_SCAN_MAX_DATA; // some of platforms restricted on IW_SCAN_MAX_DATA
+@@ -878,7 +878,7 @@
+ struct iw_point *data, char *essid)
+ {
+
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ NDIS_802_11_SSID Ssid, *pSsid=NULL;
+ ULONG Length;
+
+@@ -945,7 +945,7 @@
+ struct iw_point *data, char *essid)
+ {
+
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -966,7 +966,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *nickname)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -986,7 +986,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *nickname)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1003,7 +1003,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ u16 val;
+
+ //check if the interface is down
+@@ -1030,7 +1030,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1047,7 +1047,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ u16 val;
+
+ //check if the interface is down
+@@ -1072,7 +1072,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if the interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1089,7 +1089,7 @@
+ struct iw_request_info *info,
+ struct iw_point *erq, char *keybuf)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ union {
+ char buf[sizeof(NDIS_802_11_WEP)+MAX_LEN_OF_KEY- 1];
+ NDIS_802_11_WEP keyinfo;
+@@ -1204,7 +1204,7 @@
+ struct iw_request_info *info,
+ struct iw_point *erq, char *key)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ int kid;
+
+ //check if the interface is down
+@@ -1259,7 +1259,7 @@
+ rt_ioctl_setparam(struct net_device *dev, struct iw_request_info *info,
+ void *w, char *extra)
+ {
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ struct rt_priv_support *PRTMP_PRIVATE_SET_PROC;
+ char *this_char = extra;
+ char *value;
+@@ -2846,7 +2846,7 @@
+ IN OUT struct ifreq *rq,
+ IN INT cmd)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ struct iwreq *wrq = (struct iwreq *) rq;
+ struct iw_point *erq = NULL;
+ struct iw_freq *frq = NULL;
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtmp_main.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtmp_main.c
+@@ -133,7 +133,7 @@
+ struct net_device_stats *rt73_get_ether_stats(
+ IN struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_INFO, "rt73_get_ether_stats --->\n");
+
+@@ -195,7 +195,7 @@
+ struct iw_statistics *rt73_get_wireless_stats(
+ IN struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_TRACE, "rt73_get_wireless_stats --->\n");
+
+@@ -1648,7 +1648,7 @@
+
+ static int usb_rtusb_open(struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+
+ DBGPRINT(RT_DEBUG_TRACE, "--> %s: driver version - %s\n",
+@@ -1715,7 +1715,7 @@
+
+ static int usb_rtusb_close(struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+
+ DECLARE_WAIT_QUEUE_HEAD (unlink_wakeup);
+ DECLARE_WAITQUEUE (wait, current);
+@@ -2178,22 +2178,13 @@
+ goto out_noalloc;
+ }
+
+- /* RTMP_ADAPTER is too big with 64-bit pointers, and using the
+- builtin net_device private area causes the allocation to
+- exceed 128KB and fail. So we allocate it separately. */
+- pAd = kzalloc(sizeof (*pAd), GFP_KERNEL);
+- if (!pAd) {
+- KPRINT(KERN_CRIT, "couldn't allocate RTMP_ADAPTER\n");
+- goto out_noalloc;
+- }
+-
+- netdev = alloc_etherdev(0);
++ netdev = alloc_etherdev(sizeof(*pAd));
+ if (!netdev) {
+ KPRINT(KERN_CRIT, "alloc_etherdev failed\n");
+ goto out_nonetdev;
+ }
+
+- netdev->priv = pAd;
++ pAd = netdev_priv(netdev);
+ pAd->pUsb_Dev = dev;
+
+ RTUSBReadMACRegister(pAd, MAC_CSR0, &version);
+@@ -2277,7 +2268,6 @@
+ out_noregnetdev:
+ free_netdev(netdev);
+ out_nonetdev:
+- kfree(pAd);
+ out_noalloc:
+ usb_put_dev(dev);
+ DBGPRINT(RT_DEBUG_TRACE, "<-- %s: res=%d\n", __FUNCTION__, res);
+@@ -2327,7 +2317,6 @@
+ MlmeFreeMemoryHandler(pAd); //Free MLME memory handler
+
+ free_netdev(pAd->net_dev);
+- kfree(pAd);
+ usb_put_dev(dev);
+
+ DBGPRINT(RT_DEBUG_TRACE,"<-- %s\n", __FUNCTION__);
+--- rt73-1.0.3.6-cvs20080623-dfsg1.orig/Module/rtusb_data.c
++++ rt73-1.0.3.6-cvs20080623-dfsg1/Module/rtusb_data.c
+@@ -340,7 +340,7 @@
+ IN struct sk_buff *pSkb,
+ IN struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+ //INT Index;
+
Modified: unstable/rt73/debian/patches/series
===================================================================
--- unstable/rt73/debian/patches/series 2009-04-08 01:43:05 UTC (rev 165)
+++ unstable/rt73/debian/patches/series 2009-04-08 01:44:18 UTC (rev 166)
@@ -2,3 +2,4 @@
001_fix_probe_148f_2573.diff
002_fix_probe_crash.diff
003_fix_probe_request_overflow.diff
+004_use_netdev_functions.diff
More information about the Pkg-ralink-commits
mailing list