diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:42:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:42:58 +0000 |
| commit | da1bb88a2b900f0392b731ec47c5e1bff956fd8f (patch) | |
| tree | 597146471e3eeafb4ba55e802e80b896770808ff /target/linux/generic/patches-2.6.30/640-br2684_backport_routed.patch | |
| parent | 6117c04c9416b295347fb45c37e430f01df1d0d9 (diff) | |
| download | upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.tar.gz upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.tar.bz2 upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.zip | |
rename target/linux/generic-2.6 to generic
SVN-Revision: 21952
Diffstat (limited to 'target/linux/generic/patches-2.6.30/640-br2684_backport_routed.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.30/640-br2684_backport_routed.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.30/640-br2684_backport_routed.patch b/target/linux/generic/patches-2.6.30/640-br2684_backport_routed.patch new file mode 100644 index 0000000000..d925144fa9 --- /dev/null +++ b/target/linux/generic/patches-2.6.30/640-br2684_backport_routed.patch @@ -0,0 +1,42 @@ +commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a +Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> +Date: Fri Dec 4 11:06:32 2009 +0000 + + atm: [br2684] allow routed mode operation again + + in routed mode, we don't have a hardware address so netdev_ops doesnt + need to validate our hardware address via .ndo_validate_addr + + Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com> + Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> + Signed-off-by: David S. Miller <davem@davemloft.net> + +--- a/net/atm/br2684.c ++++ b/net/atm/br2684.c +@@ -544,6 +544,12 @@ static const struct net_device_ops br268 + .ndo_validate_addr = eth_validate_addr, + }; + ++static const struct net_device_ops br2684_netdev_ops_routed = { ++ .ndo_start_xmit = br2684_start_xmit, ++ .ndo_set_mac_address = br2684_mac_addr, ++ .ndo_change_mtu = eth_change_mtu ++}; ++ + static void br2684_setup(struct net_device *netdev) + { + struct br2684_dev *brdev = BRPRIV(netdev); +@@ -559,11 +565,10 @@ static void br2684_setup(struct net_devi + static void br2684_setup_routed(struct net_device *netdev) + { + struct br2684_dev *brdev = BRPRIV(netdev); +- brdev->net_dev = netdev; + ++ brdev->net_dev = netdev; + netdev->hard_header_len = 0; +- +- netdev->netdev_ops = &br2684_netdev_ops; ++ netdev->netdev_ops = &br2684_netdev_ops_routed; + netdev->addr_len = 0; + netdev->mtu = 1500; + netdev->type = ARPHRD_PPP; |