This is a note to let you know that I've just added the patch titled

    atm: [br2684] allow routed mode operation again

to the 2.6.32-longterm tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary

The filename of the patch is:
     atm-allow-routed-mode-operation-again.patch
and it can be found in the queue-2.6.32 subdirectory.

If you, or anyone else, feels it should not be added to the 2.6.32 longterm 
tree,
please let <sta...@kernel.org> know about it.


>From 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a Mon Sep 17 00:00:00 2001
From: chas williams - CONTRACTOR <c...@cmf.nrl.navy.mil>
Date: Fri, 4 Dec 2009 11:06:32 +0000
Subject: atm: [br2684] allow routed mode operation again

From: chas williams - CONTRACTOR <c...@cmf.nrl.navy.mil>

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>
Cc: Pascal Hambourg <pas...@plouf.fr.eu.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 net/atm/br2684.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -554,6 +554,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);
@@ -569,11 +575,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;


Patches currently in longterm-queue-2.6.32 which might be from 
c...@cmf.nrl.navy.mil are

/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/atm-allow-routed-mode-operation-again.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to