Hello,
commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a in 2.6.33 was not
backported to older versions. (it fixes a regression introduced by
commit 0ba25ff4c669e5395110ba6ab4958a97a9f96922 in 2.6.30)
Please apply to 2.6.32-stable.
Thanks.
------------------
From: chas williams - CONTRACTOR <c...@cmf.nrl.navy.mil>
Date: Fri, 4 Dec 2009 11:06:32 +0000
Subject: [PATCH] atm: [br2684] allow routed mode operation again
commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a upstream.
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 <mfuen...@agenciaefe.com>
Signed-off-by: Chas Williams - CONTRACTOR <c...@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <da...@davemloft.net>
---
net/atm/br2684.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 26a646d..c9230c3 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -554,6 +554,12 @@ static const struct net_device_ops br2684_netdev_ops = {
.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);
@@ -569,11 +575,10 @@ static void br2684_setup(struct net_device *netdev)
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;
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
