rpms/kernel/devel linux-2.6-bcm43xx-git.patch,1.3,1.4

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Mar 25 00:06:24 UTC 2006


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10673

Modified Files:
	linux-2.6-bcm43xx-git.patch 
Log Message:
remove dupe


linux-2.6-bcm43xx-git.patch:
 Documentation/networking/bcm43xx.txt           |   36 
 drivers/net/wireless/Kconfig                   |    6 
 drivers/net/wireless/Makefile                  |    1 
 drivers/net/wireless/bcm43xx/Kconfig           |   62 
 drivers/net/wireless/bcm43xx/Makefile          |   11 
 drivers/net/wireless/bcm43xx/bcm43xx.h         |  955 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |  503 ++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |  117 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c     |  989 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h     |  221 +
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c     |  367 ++
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h     |   34 
 drivers/net/wireless/bcm43xx/bcm43xx_leds.c    |  287 +
 drivers/net/wireless/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    | 4364 +++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.h    |  283 +
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     | 2122 ++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_phy.h     |   74 
 drivers/net/wireless/bcm43xx/bcm43xx_pio.c     |  603 +++
 drivers/net/wireless/bcm43xx/bcm43xx_pio.h     |  138 
 drivers/net/wireless/bcm43xx/bcm43xx_power.c   |  358 ++
 drivers/net/wireless/bcm43xx/bcm43xx_power.h   |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c   | 1766 ++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h   |   94 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      | 1070 ++++++
 drivers/net/wireless/bcm43xx/bcm43xx_wx.h      |   36 
 28 files changed, 14657 insertions(+), 1 deletion(-)

Index: linux-2.6-bcm43xx-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-bcm43xx-git.patch	3 Mar 2006 03:36:21 -0000	1.3
+++ linux-2.6-bcm43xx-git.patch	25 Mar 2006 00:06:19 -0000	1.4
@@ -14759,86 +14759,3 @@
  
  # yes, this works even when no drivers are selected
  config NET_WIRELESS
---- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-03-02 18:24:56.000000000 -0500
-+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c	2006-03-02 18:25:19.000000000 -0500
-@@ -773,6 +773,80 @@ int ieee80211_rx(struct ieee80211_device
- 	return 0;
- }
- 
-+/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
-+int ieee80211_rx_any(struct ieee80211_device *ieee,
-+		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
-+{
-+	struct ieee80211_hdr_4addr *hdr;
-+	int is_packet_for_us;
-+	u16 fc;
-+
-+	if (ieee->iw_mode == IW_MODE_MONITOR)
-+		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
-+
-+	hdr = (struct ieee80211_hdr_4addr *)skb->data;
-+	fc = le16_to_cpu(hdr->frame_ctl);
-+
-+	if ((fc & IEEE80211_FCTL_VERS) != 0)
-+		return -EINVAL;
-+		
-+	switch (fc & IEEE80211_FCTL_FTYPE) {
-+	case IEEE80211_FTYPE_MGMT:
-+		ieee80211_rx_mgt(ieee, hdr, stats);
-+		return 0;
-+	case IEEE80211_FTYPE_DATA:
-+		break;
-+	case IEEE80211_FTYPE_CTL:
-+		return 0;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	is_packet_for_us = 0;
-+	switch (ieee->iw_mode) {
-+	case IW_MODE_ADHOC:
-+		/* our BSS and not from/to DS */
-+		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
-+		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
-+			/* promisc: get all */
-+			if (ieee->dev->flags & IFF_PROMISC)
-+				is_packet_for_us = 1;
-+			/* to us */
-+			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
-+				is_packet_for_us = 1;
-+			/* mcast */
-+			else if (is_multicast_ether_addr(hdr->addr1))
-+				is_packet_for_us = 1;
-+		}
-+		break;
-+	case IW_MODE_INFRA:
-+		/* our BSS (== from our AP) and from DS */
-+		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
-+		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
-+			/* promisc: get all */
-+			if (ieee->dev->flags & IFF_PROMISC)
-+				is_packet_for_us = 1;
-+			/* to us */
-+			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
-+				is_packet_for_us = 1;
-+			/* mcast */
-+			else if (is_multicast_ether_addr(hdr->addr1)) {
-+				/* not our own packet bcasted from AP */
-+				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
-+					is_packet_for_us = 1;
-+			}
-+		}
-+		break;
-+	default:
-+		/* ? */
-+		break;
-+	}
-+
-+	if (is_packet_for_us)
-+		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
-+	return 0;
-+}
-+
- #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
- 
- static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };




More information about the fedora-cvs-commits mailing list