Changeset 3545


Ignore:
Timestamp:
2006-03-29T14:35:35+02:00 (12 years ago)
Author:
wbx
Message:

remove ethernet bonding updates

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/brcm-2.6/patches/005-bcm43xx-dscape-060328.patch

    r3536 r3545  
     1diff -Nur linux-2.6.16/Documentation/networking/bcm43xx-d80211-HOWTO.txt linux-2.6.16-bcm43xx/Documentation/networking/bcm43xx-d80211-HOWTO.txt 
     2--- linux-2.6.16/Documentation/networking/bcm43xx-d80211-HOWTO.txt      1970-01-01 01:00:00.000000000 +0100 
     3+++ linux-2.6.16-bcm43xx/Documentation/networking/bcm43xx-d80211-HOWTO.txt      2006-03-28 22:16:14.000000000 +0200 
     4@@ -0,0 +1,67 @@ 
     5+****                                    **** 
     6+****  HOWTO get bcm43xx-dscape running  **** 
     7+****                                    **** 
     8+ 
     9+This is a port of the bcm43xx driver for the devicescape ieee802.11 
     10+stack. The devicescape ieee802.11 stack is an advanced out-of-mainline 
     11+802.11 protocol module. 
     12+I will call the "devicescape ieee802.11 stack" simply "dscape" in the 
     13+following text. 
     14+ 
     15+ 
     16+*** Setting up the bcm43xx driver with dscape is currently non-trivial, 
     17+*** as several modifications to the kernel and the userland 
     18+*** wpa_supplicant tool are required. We are working on it... 
     19+ 
     20+ 
     21+1)  You need to patch the kernel with the ieee80211-devicescape stack 
     22+    and the bcm43xx-dscape port. 
     23+    Both are available in one cummulative at: 
     24+    ftp://ftp.bu3sch.de/bcm43xx-snapshots/all-in-one/bcm43xx-dscape/ 
     25+    Read the instructions on http://bcm43xx.berlios.de/ for how to apply 
     26+    this patch. 
     27+ 
     28+    Patch the kernel, compile and install it. 
     29+    When configuring, enable 
     30+    "Networking/Generic IEEE 802.11 Networking Stack (dscape)" 
     31+    and 
     32+    "Device Drivers/Network device support/Wireless LAN (non-hamradio)/Broadcom BCM43xx wireless support (DeviceScape stack)" 
     33+    Reboot. 
     34+ 
     35+2)  Set up a wpa_supplicant config file in /etc/wpa_supplicant.conf 
     36+    Here is an example for an AES WPA encrypted network: 
     37+ 
     38+       # WPA AES encryption 
     39+       ctrl_interface=/var/run/wpa_supplicant 
     40+       network={ 
     41+               ssid="ACCESSPOINT_SSID" 
     42+               key_mgmt=WPA-PSK 
     43+               proto=WPA 
     44+               pairwise=CCMP TKIP 
     45+               group=CCMP TKIP 
     46+               psk="MY PASSPHRASE" 
     47+               priority=3 
     48+       } 
     49+ 
     50+3)  Take a bottle of your favourite beer, open it and take a swallow. 
     51+ 
     52+4)  Now it's time to bring the driver up. 
     53+    Do modprobe bcm43xx-d80211 to load the driver. 
     54+    There is an ugly bash script to bring the driver up after insmod. 
     55+    It is found in the "scripts" subdirectory of the patched kernel 
     56+    tree and is called "bcm43xx-d80211-sta_up.sh". 
     57+    Call scripts/bcm43xx-d80211-sta_up.sh --help to get some usage information. 
     58+    It may suffice to call scripts/bcm43xx-d80211-sta_up.sh without any parameters. See 
     59+    the help. Default parameters, which are used when called without parameters, 
     60+    are explained there. 
     61+ 
     62+5)  If you want to access the internet, make sure your default route 
     63+    is correctly set up with your gateway's IP: 
     64+    route add default gw 192.168.xxx.xxx 
     65+ 
     66+6)  Take another swallow from your bottle of beer and test if it works: 
     67+    ping www.kernel.org 
     68+ 
     69+7)  If it works, drink the rest of your beer. Otherwise read this HOWTO again, 
     70+    and again and again. Complain to bcm43xx-dev@lists.berlios.de, if it still 
     71+    does not work. 
     72diff -Nur linux-2.6.16/Documentation/networking/bcm43xx-d80211.txt linux-2.6.16-bcm43xx/Documentation/networking/bcm43xx-d80211.txt 
     73--- linux-2.6.16/Documentation/networking/bcm43xx-d80211.txt    1970-01-01 01:00:00.000000000 +0100 
     74+++ linux-2.6.16-bcm43xx/Documentation/networking/bcm43xx-d80211.txt    2006-03-28 22:16:14.000000000 +0200 
     75@@ -0,0 +1,31 @@ 
     76+ 
     77+                       BCM43xx Linux Driver Project 
     78+                       ============================ 
     79+ 
     80+About this software 
     81+------------------- 
     82+ 
     83+The goal of this project is to develop a linux driver for Broadcom 
     84+BCM43xx chips, based on the specification at  
     85+http://bcm-specs.sipsolutions.net/ 
     86+ 
     87+The project page is http://bcm43xx.berlios.de/ 
     88+ 
     89+This is a port of the bcm43xx driver for the devicescape ieee802.11 
     90+stack.   
     91+ 
     92+Requirements 
     93+------------ 
     94+ 
     95+1)     Linux Kernel 2.6.16 or later 
     96+       http://www.kernel.org/ 
     97+ 
     98+       See Documentation/networking/bcm43xx-d80211-HOWTO.txt for further  
     99+       instructions.  
     100+ 
     101+2)     Firmware Files 
     102+ 
     103+       Please try bcm43xx-fwcutter. It can extract the firmware from various  
     104+       binary driver files and supports driver files from Windows, MacOS and  
     105+       Linux. You can get bcm43xx-fwcutter from http://bcm43xx.berlios.de/. 
     106+       Also, bcm43xx-fwcutter comes with a README file for further instructions. 
    1107diff -Nur linux-2.6.16/drivers/net/wireless/bcm43xx-d80211/bcm43xx_debugfs.c linux-2.6.16-bcm43xx/drivers/net/wireless/bcm43xx-d80211/bcm43xx_debugfs.c 
    2108--- linux-2.6.16/drivers/net/wireless/bcm43xx-d80211/bcm43xx_debugfs.c  1970-01-01 01:00:00.000000000 +0100 
     
    1661016716diff -Nur linux-2.6.16/net/core/dev.c linux-2.6.16-bcm43xx/net/core/dev.c 
    1661116717--- linux-2.6.16/net/core/dev.c 2006-03-20 06:53:29.000000000 +0100 
    16612 +++ linux-2.6.16-bcm43xx/net/core/dev.c 2006-03-28 22:16:14.000000000 +0200 
     16718+++ linux-2.6.16-bcm43xx/net/core/dev.c 2006-03-29 14:12:58.000000000 +0200 
    1661316719@@ -110,10 +110,8 @@ 
    1661416720 #include <linux/netpoll.h> 
     
    1661716723-#ifdef CONFIG_NET_RADIO 
    1661816724-#include <linux/wireless.h>            /* Note : will define WIRELESS_EXT */ 
    16619 +#include <linux/wireless.h> 
     16725+#include <linux/wireless.h>            /* Note : will define CONFIG_WIRELESS_EXT */ 
    1662016726 #include <net/iw_handler.h> 
    1662116727-#endif /* CONFIG_NET_RADIO */ 
     
    1662316729  
    1662416730 /* 
    16625 @@ -1448,8 +1446,29 @@ 
    16626  { 
    16627         struct net_device *dev = skb->dev; 
    16628   
    16629 -       if (dev->master) 
    16630 +       if (dev->master) { 
    16631 +               /* 
    16632 +                * On bonding slaves other than the currently active 
    16633 +                * slave, suppress duplicates except for 802.3ad 
    16634 +                * ETH_P_SLOW and alb non-mcast/bcast. 
    16635 +                */ 
    16636 +               if (dev->priv_flags & IFF_SLAVE_INACTIVE) { 
    16637 +                       if (dev->master->priv_flags & IFF_MASTER_ALB) { 
    16638 +                               if (skb->pkt_type != PACKET_BROADCAST && 
    16639 +                                   skb->pkt_type != PACKET_MULTICAST) 
    16640 +                                       goto keep; 
    16641 +                       } 
    16642 + 
    16643 +                       if (dev->master->priv_flags & IFF_MASTER_8023AD && 
    16644 +                           skb->protocol == __constant_htons(ETH_P_SLOW)) 
    16645 +                               goto keep; 
    16646 +                
    16647 +                       kfree_skb(skb); 
    16648 +                       return NULL; 
    16649 +               } 
    16650 +keep: 
    16651                 skb->dev = dev->master; 
    16652 +       } 
    16653   
    16654         return dev; 
    16655  } 
    16656 @@ -1593,6 +1612,9 @@ 
    16657   
    16658         orig_dev = skb_bond(skb); 
    16659   
    16660 +       if (!orig_dev) 
    16661 +               return NET_RX_DROP; 
    16662 + 
    16663         __get_cpu_var(netdev_rx_stat).total++; 
    16664   
    16665         skb->h.raw = skb->nh.raw = skb->data; 
    16666 @@ -2028,7 +2050,7 @@ 
     16731@@ -2028,7 +2026,7 @@ 
    1666716732        .release = seq_release, 
    1666816733 }; 
     
    1667316738 #else 
    1667416739 #define wireless_proc_init() 0 
    16675 @@ -2582,7 +2604,7 @@ 
     16740@@ -2582,7 +2580,7 @@ 
    1667616741                                        ret = -EFAULT; 
    1667716742                                return ret; 
     
    1668216747                        if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) { 
    1668316748                                /* If command is `set a parameter', or 
    16684 @@ -2603,7 +2625,7 @@ 
     16749@@ -2603,7 +2601,7 @@ 
    1668516750                                        ret = -EFAULT; 
    1668616751                                return ret; 
Note: See TracChangeset for help on using the changeset viewer.