r159 - unstable/rt2500/debian/patches
Ben Hutchings
benh at alioth.debian.org
Wed Apr 8 01:27:08 UTC 2009
Author: benh
Date: 2009-04-08 01:27:08 +0000 (Wed, 08 Apr 2009)
New Revision: 159
Added:
unstable/rt2500/debian/patches/008_use_netdev_functions.diff
Modified:
unstable/rt2500/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/rt2500/debian/patches/008_use_netdev_functions.diff
===================================================================
--- unstable/rt2500/debian/patches/008_use_netdev_functions.diff (rev 0)
+++ unstable/rt2500/debian/patches/008_use_netdev_functions.diff 2009-04-08 01:27:08 UTC (rev 159)
@@ -0,0 +1,170 @@
+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.
+
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_main.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_main.c
+@@ -292,7 +292,7 @@
+
+ // Save CSR virtual address and irq to device structure
+ net_dev->base_addr = (unsigned long)csr_addr;
+- pAd = net_dev->priv;
++ pAd = netdev_priv(net_dev);
+ pAd->CSRBaseAddress = net_dev->base_addr;
+ pAd->net_dev = net_dev;
+
+@@ -388,7 +388,7 @@
+ INT RT2500_open(
+ IN struct net_device *net_dev)
+ {
+- PRTMP_ADAPTER pAd = net_dev->priv;
++ PRTMP_ADAPTER pAd = netdev_priv(net_dev);
+ INT status = NDIS_STATUS_SUCCESS;
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+@@ -510,7 +510,7 @@
+ IN struct net_device *net_dev)
+ {
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+- PRTMP_ADAPTER pAdapter = net_dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_INFO, "<==== RTMPSendPackets\n");
+
+@@ -595,7 +595,7 @@
+ #endif
+ {
+ struct net_device *net_dev = dev_instance;
+- PRTMP_ADAPTER pAdapter = net_dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(net_dev);
+ INTSRC_STRUC IntSource;
+ int ret = 0;
+
+@@ -708,7 +708,7 @@
+
+ int rt2500_set_mac_address(struct net_device *net_dev, void *addr)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ struct sockaddr *mac = (struct sockaddr*) addr;
+ u32 set_mac;
+
+@@ -766,7 +766,7 @@
+ struct iw_statistics *RT2500_get_wireless_stats(
+ IN struct net_device *net_dev)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+
+ // TODO: All elements are zero before be implemented
+
+@@ -808,7 +808,7 @@
+ struct net_device_stats *RT2500_get_ether_stats(
+ IN struct net_device *net_dev)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+
+ DBGPRINT(RT_DEBUG_INFO, "RT2500_get_ether_stats --->\n");
+
+@@ -868,7 +868,7 @@
+ IN struct net_device *net_dev)
+ {
+ RTMP_ADAPTER *pAd;
+- pAd = net_dev->priv;
++ pAd = netdev_priv(net_dev);
+ if (pAd->PortCfg.BssType == BSS_MONITOR)
+ {
+ RTMP_IO_WRITE32(pAd, RXCSR0, 0x46);
+@@ -895,7 +895,7 @@
+ INT RT2500_close(
+ IN struct net_device *net_dev)
+ {
+- RTMP_ADAPTER *pAd = net_dev->priv;
++ RTMP_ADAPTER *pAd = netdev_priv(net_dev);
+ // LONG ioaddr = net_dev->base_addr;
+
+ DBGPRINT(RT_DEBUG_TRACE, "%s: ===> RT2500_close\n", net_dev->name);
+@@ -949,7 +949,7 @@
+ rt2500pci_close_debugfs(pAd);
+
+ // Free Ring buffers
+- RTMPFreeDMAMemory(net_dev->priv);
++ RTMPFreeDMAMemory(netdev_priv(net_dev));
+
+ // Unregister network device
+ unregister_netdev(net_dev);
+@@ -964,7 +964,7 @@
+ pci_disable_device(pPci_Dev);
+
+ // Free pre-allocated net_device memory
+- kfree(net_dev);
++ free_netdev(net_dev);
+ }
+
+ //
+@@ -989,7 +989,7 @@
+ static int rt2500_suspend(struct pci_dev *pdev, pm_message_t state)
+ {
+ struct net_device *dev = pci_get_drvdata(pdev);
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+
+
+ if(pAdapter->PortCfg.bRadio)
+@@ -1020,7 +1020,7 @@
+ static int rt2500_resume(struct pci_dev *pdev)
+ {
+ struct net_device *dev = pci_get_drvdata(pdev);
+- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++ PRTMP_ADAPTER pAdapter = netdev_priv(dev);
+ int status;
+
+ // FIXME: code should process error case correctly
+--- rt2500-1.1.0-b4+cvs20080623.orig/Module/rtmp_info.c
++++ rt2500-1.1.0-b4+cvs20080623/Module/rtmp_info.c
+@@ -237,7 +237,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;
+@@ -346,7 +346,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;
+ char *value;
+@@ -395,7 +395,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;
+
+@@ -455,7 +455,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;
+ char *end_buf = extra + IW_SCAN_MAX_DATA;
+@@ -1663,7 +1663,7 @@
+ IN OUT struct ifreq *rq,
+ IN INT cmd)
+ {
+- PRTMP_ADAPTER pAdapter= net_dev->priv;
++ PRTMP_ADAPTER pAdapter= netdev_priv(net_dev);
+ struct iwreq *wrq = (struct iwreq *) rq;
+ struct iw_point *erq = NULL;
+ struct iw_freq *frq = NULL;
Modified: unstable/rt2500/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series 2009-04-08 01:24:45 UTC (rev 158)
+++ unstable/rt2500/debian/patches/series 2009-04-08 01:27:08 UTC (rev 159)
@@ -2,3 +2,4 @@
005_fix_error_rate_vars.diff
006_fix_probe_request_overflow.diff
007_no_config_file.diff
+008_use_netdev_functions.diff
More information about the Pkg-ralink-commits
mailing list