diff options
| author | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-03-14 16:36:44 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-03-14 16:36:44 -0700 |
| commit | a51075a87789b10bddf2639e9e8780ba00e31ab4 (patch) | |
| tree | 638a71a614c71ec4510e5bb79076cd874e2045a7 /patches | |
| parent | 1e8c8a24c5f0d7b71d81dd3f6976005be7c91767 (diff) | |
compat-wireless: backport netdev->addr_assign_type
You cannot backport assignment of netdev->addr_assign_type
given that its part of the netdev data structure only in future
kernels, so we backport this through a new patch file:
patches/61-netdev-addr_assign_type.patch
mcgrof@tux ~/linux-next (git::master)$ git describe --contains c1f79426
v2.6.36-rc1~571^2~104
This fixes compilation of the Atheros Ethernet drivers down to 2.6.35.
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/61-netdev-addr_assign_type.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/patches/61-netdev-addr_assign_type.patch b/patches/61-netdev-addr_assign_type.patch new file mode 100644 index 00000000..37c7efac --- /dev/null +++ b/patches/61-netdev-addr_assign_type.patch @@ -0,0 +1,53 @@ +You cannot backport assignment of netdev->addr_assign_type +given that its part of the netdev data structure only in future +kernels. + +mcgrof@tux ~/linux-next (git::master)$ git describe --contains c1f79426 +v2.6.36-rc1~571^2~104 + +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -472,7 +472,9 @@ static int atl1c_set_mac_addr(struct net + + memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); + memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + netdev->addr_assign_type &= ~NET_ADDR_RANDOM; ++#endif + + atl1c_hw_set_mac_addr(&adapter->hw); + +@@ -2772,7 +2774,9 @@ static int __devinit atl1c_probe(struct + } + if (atl1c_read_mac_addr(&adapter->hw)) { + /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + netdev->addr_assign_type |= NET_ADDR_RANDOM; ++#endif + } + memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); + memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); +--- a/drivers/net/ethernet/atheros/atlx/atlx.c ++++ b/drivers/net/ethernet/atheros/atlx/atlx.c +@@ -84,7 +84,9 @@ static int atlx_set_mac(struct net_devic + + memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); + memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + netdev->addr_assign_type &= ~NET_ADDR_RANDOM; ++#endif + + atlx_set_mac_addr(&adapter->hw); + return 0; +--- a/drivers/net/ethernet/atheros/atlx/atl1.c ++++ b/drivers/net/ethernet/atheros/atlx/atl1.c +@@ -3019,7 +3019,9 @@ static int __devinit atl1_probe(struct p + /* copy the MAC address out of the EEPROM */ + if (atl1_read_mac_addr(&adapter->hw)) { + /* mark random mac */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + netdev->addr_assign_type |= NET_ADDR_RANDOM; ++#endif + } + memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); + |