r162 - unstable/rt2570/debian/patches
Ben Hutchings
benh at alioth.debian.org
Wed Apr 8 01:38:10 UTC 2009
Author: benh
Date: 2009-04-08 01:38:10 +0000 (Wed, 08 Apr 2009)
New Revision: 162
Added:
unstable/rt2570/debian/patches/008_use_netdev_functions.diff
Modified:
unstable/rt2570/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/rt2570/debian/patches/008_use_netdev_functions.diff
===================================================================
--- unstable/rt2570/debian/patches/008_use_netdev_functions.diff (rev 0)
+++ unstable/rt2570/debian/patches/008_use_netdev_functions.diff 2009-04-08 01:38:10 UTC (rev 162)
@@ -0,0 +1,386 @@
+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.
+
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_main.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_main.c
+@@ -275,7 +275,7 @@
+ struct net_device_stats *
+ rt_getstats(struct net_device *dev)
+ {
+- PRT2570ADAPTER pAd = (PRT2570ADAPTER)dev->priv;
++ PRT2570ADAPTER pAd = netdev_priv(dev);
+ struct net_device_stats *stats= &pAd->net_device_stats;
+
+ stats->rx_bytes = pAd->RalinkCounters.ReceivedByteCount;
+@@ -309,7 +309,7 @@
+ struct iw_statistics *RTUSB_get_wireless_stats(
+ IN struct net_device *net_dev)
+ {
+- PRT2570ADAPTER pAd = (PRT2570ADAPTER)net_dev->priv;
++ PRT2570ADAPTER pAd = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_TRACE, "--->RTUSB_get_wireless_stats \n");
+
+@@ -336,7 +336,7 @@
+
+ int rt2570_set_mac_address(struct net_device *net_dev, void *addr)
+ {
+- RT2570ADAPTER *pAd = net_dev->priv;
++ RT2570ADAPTER *pAd = netdev_priv(net_dev);
+ struct sockaddr *mac = (struct sockaddr*) addr;
+
+ if(netif_running(net_dev))
+@@ -1396,7 +1396,7 @@
+ static int usb_rtusb_open(struct net_device *net_dev)
+ {
+
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) net_dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(net_dev);
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+ //NDIS_802_11_WEP WepKey;
+
+@@ -1451,7 +1451,7 @@
+
+ static int usb_rtusb_close(struct net_device *net)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) net->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(net);
+
+ DECLARE_WAIT_QUEUE_HEAD (unlink_wakeup);
+ DECLARE_WAITQUEUE (wait, current);
+@@ -1884,14 +1884,14 @@
+ goto out_noalloc;
+ }
+
+- pAdapter = netdev->priv;
++ pAdapter = netdev_priv(netdev);
+ pAdapter->usb = dev;
+
+ RTUSBReadMACRegister(pAdapter, MAC_CSR0, &version);
+ if (version == 0 || (le16_to_cpu(version) & 0xfff0) != 0)
+ {
+ KPRINT(KERN_INFO, "ASIC version not matching\n");
+- kfree(netdev);
++ free_netdev(netdev);
+ res = -ENODEV;
+ goto out_noalloc;
+ }
+@@ -1904,7 +1904,6 @@
+
+ netdev->open = usb_rtusb_open;
+ netdev->stop = usb_rtusb_close;
+- netdev->priv = pAdapter;
+ netdev->hard_start_xmit = RTUSBSendPackets;
+ netdev->get_stats = rt_getstats;
+ #if 1
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_info.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_info.c
+@@ -200,7 +200,7 @@
+ struct iw_request_info *info,
+ struct iw_freq *freq, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int chan = -1;
+
+ //check if interface is down
+@@ -232,7 +232,7 @@
+ struct iw_request_info *info,
+ struct iw_freq *freq, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ DBGPRINT(RT_DEBUG_TRACE,"==>IOCTL::rtusb_ioctl_giwfreq %d\n",pAdapter->PortCfg.Channel);
+
+ //check if interface is down
+@@ -257,7 +257,7 @@
+ struct iw_request_info *info,
+ __u32 *mode, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -330,7 +330,7 @@
+ struct iw_request_info *info,
+ __u32 *mode, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -353,7 +353,7 @@
+ struct iw_request_info *info,
+ char *name, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -366,7 +366,7 @@
+ struct iw_request_info *info,
+ char *name, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -381,7 +381,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ struct iw_range *range = (struct iw_range *) extra;
+ u16 val;
+ int i;
+@@ -485,7 +485,7 @@
+ struct sockaddr *ap_addr, char *extra)
+ {
+
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -538,7 +538,7 @@
+ struct iw_point *data, char *extra)
+ {
+
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ struct sockaddr addr[IW_MAX_AP];
+ struct iw_quality qual[IW_MAX_AP];
+ int i;
+@@ -568,7 +568,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int Status = STATUS_SUCCESS;
+
+ //check if interface is down
+@@ -619,7 +619,7 @@
+ struct iw_point *data, char *extra)
+ {
+
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int i=2, j;
+ char *current_ev = extra;
+ char *end_buf = extra + IW_SCAN_MAX_DATA;
+@@ -717,7 +717,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *essid)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ NDIS_802_11_SSID Ssid, *pSsid=NULL;
+ ULONG Length;
+
+@@ -775,7 +775,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *essid)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -798,7 +798,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *nickname)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -819,7 +819,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *nickname)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -839,7 +839,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ u16 val;
+
+ //check if interface is down
+@@ -863,7 +863,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -881,7 +881,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ u16 val;
+
+ //check if interface is down
+@@ -903,7 +903,7 @@
+ struct iw_request_info *info,
+ struct iw_param *rts, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -920,7 +920,7 @@
+ struct iw_request_info *info,
+ struct iw_point *erq, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ NDIS_802_11_WEP WepKey;
+ int index, len;
+ CHAR kid = 0;
+@@ -1017,7 +1017,7 @@
+ struct iw_request_info *info,
+ struct iw_point *erq, char *key)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int kid;
+
+ //check if interface is down
+@@ -1065,7 +1065,7 @@
+ rtusb_ioctl_setauth(struct net_device *dev, struct iw_request_info *info,
+ void *w, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param = *(int *) extra;
+
+ //check if interface is down
+@@ -1111,7 +1111,7 @@
+ void *w, char *extra)
+ {
+
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param = *(int *)extra;
+ USHORT Value;
+
+@@ -1155,7 +1155,7 @@
+ void *w, char *extra)
+ {
+
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param = *(int *)extra;
+ NDIS_802_11_WEP_STATUS WepStatus;//set by OID_802_11_WEP_STATUS
+
+@@ -1213,7 +1213,7 @@
+ rtusb_ioctl_setwpapsk(struct net_device *dev, struct iw_request_info *info,
+ void *w, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ NDIS_802_11_KEY Key;
+ // rtusb_ioctl_setwpapsk accept > 16 chars,
+ // so data is passed through w instead of extra.
+@@ -1281,7 +1281,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param;
+
+ //check if interface is down
+@@ -1318,7 +1318,7 @@
+ struct iw_request_info *info,
+ int *i, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1333,7 +1333,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param = *(int *)extra;
+
+ //check if interface is down
+@@ -1368,7 +1368,7 @@
+ struct iw_request_info *info,
+ int *i, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1383,7 +1383,7 @@
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param = *(int *)extra;
+
+ //check if interface is down
+@@ -1412,7 +1412,7 @@
+ struct iw_request_info *info,
+ int *i, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+
+ //check if interface is down
+ if (pAdapter->RTUSBCmdThr_pid < 0)
+@@ -1426,7 +1426,7 @@
+ static int rtusb_ioctl_setpsm(struct net_device *dev, struct iw_request_info *info,
+ void *w, char *extra)
+ {
+- PRT2570ADAPTER pAdapter = (PRT2570ADAPTER) dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(dev);
+ int param = *(int *)extra;
+
+ //check if interface is down
+@@ -4181,7 +4181,7 @@
+ int usb_rt2570_ioctl(struct net_device *net_dev, struct ifreq *rq,
+ int cmd)
+ {
+- PRT2570ADAPTER pAdapter= net_dev->priv;
++ PRT2570ADAPTER pAdapter= netdev_priv(net_dev);
+ struct iwreq *wrq = (struct iwreq *) rq;
+ struct iw_point *erq = NULL;
+ struct iw_freq *frq = NULL;
+--- rt2570-1.1.0+cvs20080623.orig/Module/rtusb_data.c
++++ rt2570-1.1.0+cvs20080623/Module/rtusb_data.c
+@@ -73,7 +73,7 @@
+ {
+
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+- PRT2570ADAPTER pAdapter = net_dev->priv;
++ PRT2570ADAPTER pAdapter = netdev_priv(net_dev);
+
+ skb->data_len = skb->len;
+ if (RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_RESET_IN_PROGRESS) ||
Modified: unstable/rt2570/debian/patches/series
===================================================================
--- unstable/rt2570/debian/patches/series 2009-04-08 01:37:07 UTC (rev 161)
+++ unstable/rt2570/debian/patches/series 2009-04-08 01:38:10 UTC (rev 162)
@@ -2,3 +2,4 @@
005_fix_delays.diff
006_fix_probe_148f_2573.diff
007_fix_probe_request_overflow.diff
+008_use_netdev_functions.diff
More information about the Pkg-ralink-commits
mailing list