| Message ID | 200912042106.nB4L6Wc7012919@cmf.nrl.navy.mil |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "Chas Williams (CONTRACTOR)" <chas@cmf.nrl.navy.mil> Date: Fri, 04 Dec 2009 16:06:32 -0500 > sorry this should be Signed-off-by me instead of manuel. *sigh* > > From: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> > > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;