diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2007-08-14 20:42:40 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2007-08-14 20:42:40 +0000 |
| commit | b3cff7255c28f8e457c36edd27d0c710699fad57 (patch) | |
| tree | 25e010b9095c336191b559392af24458205de4af /net-wireless | |
| parent | fix a race in orbit 2.14.8 per bug 466574 (diff) | |
| download | gentoo-2-b3cff7255c28f8e457c36edd27d0c710699fad57.tar.gz gentoo-2-b3cff7255c28f8e457c36edd27d0c710699fad57.tar.bz2 gentoo-2-b3cff7255c28f8e457c36edd27d0c710699fad57.zip | |
Add 2.6.22 patch thanks to Mariusz Czubacki <mariusz.czubacki@gmail.com>
(Portage version: 2.1.3.4)
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/adm8211/ChangeLog | 7 | ||||
| -rw-r--r-- | net-wireless/adm8211/adm8211-20060111.ebuild | 1 | ||||
| -rw-r--r-- | net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch | 53 |
3 files changed, 60 insertions, 1 deletions
diff --git a/net-wireless/adm8211/ChangeLog b/net-wireless/adm8211/ChangeLog index e961bf0e39d7..3b3465ca8c79 100644 --- a/net-wireless/adm8211/ChangeLog +++ b/net-wireless/adm8211/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/adm8211 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/ChangeLog,v 1.8 2007/07/23 19:53:29 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/ChangeLog,v 1.9 2007/08/14 20:42:40 genstef Exp $ + + 14 Aug 2007; Stefan Schweizer <genstef@gentoo.org> + +files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch, + adm8211-20060111.ebuild: + Add 2.6.22 patch thanks to Mariusz Czubacki <mariusz.czubacki@gmail.com> *adm8211-20060111 (23 Jul 2007) diff --git a/net-wireless/adm8211/adm8211-20060111.ebuild b/net-wireless/adm8211/adm8211-20060111.ebuild index 452149c175b4..ad601194a14a 100644 --- a/net-wireless/adm8211/adm8211-20060111.ebuild +++ b/net-wireless/adm8211/adm8211-20060111.ebuild @@ -44,6 +44,7 @@ src_unpack() { epatch ${FILESDIR}/03-fix-work_struct-build-breakage.patch epatch ${FILESDIR}/04-fix-set-essid-for-WE-21.patch epatch ${FILESDIR}/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch + kernel_is ge 2 6 22 && epatch ${FILESDIR}/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch convert_to_m ${S}/Makefile } diff --git a/net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch b/net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch new file mode 100644 index 000000000000..d3bb15d60cca --- /dev/null +++ b/net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch @@ -0,0 +1,53 @@ +>From 72c942ed694ef6249c0df84c0802e7378884e7c7 Mon Sep 17 00:00:00 2001 +From: John W. Linville <linville@tuxdriver.com> +Date: Tue, 29 May 2007 14:21:23 -0400 +Subject: [PATCH] [PATCH] adm8211: fix build breakage from skb->mac.raw + +Use skb_mac_header and related functions instead. + +Signed-off-by: John W. Linville <linville@tuxdriver.com> +--- + drivers/net/wireless/adm8211/adm8211_hw.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/adm8211/adm8211_hw.c b/adm8211/adm8211_hw.c +index 2ec950d..49d79cb 100644 +--- a/adm8211/adm8211_hw.c ++++ b/adm8211/adm8211_hw.c +@@ -499,7 +499,7 @@ static void adm8211_rx_skb(struct net_device *dev, struct sk_buff *skb) + ieee->stats.rx_packets++; + + skb->pkt_type = PACKET_OTHERHOST; +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + netif_rx(skb); + dev->last_rx = jiffies; +@@ -717,7 +717,7 @@ static void adm8211_interrupt_rci(struct net_device *dev) + #endif + stat->rssi = rssi; + stat->rate = rate; +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + skb->protocol = __constant_htons(ETH_P_802_2); + skb_queue_tail(&priv->rx_queue, skb); + tasklet_schedule(&priv->rx_tasklet); +@@ -2376,7 +2376,8 @@ static int adm8211_hard_start_xmit(struct ieee80211_txb *txb, + + int adm8211_80211_header_parse(struct sk_buff *skb, unsigned char *haddr) + { +- memcpy(haddr, skb->mac.raw + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ ++ memcpy(haddr, skb_mac_header(skb) + 10 + sizeof(struct avs_caphdr), ++ ETH_ALEN); /* addr2 */ + return ETH_ALEN; + } + +-- +1.5.2.1 + + + + + + + |