adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

atm: convert mpc device to using netdev_ops

Browse source 
This converts the mpc device to using new netdevice_ops.
Compile tested only, needs more than usual review since
device was swaping pointers around etc.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-03-20 19:35:28 +00:00 committed by David S. Miller
parent 6fb70fd1b5
commit 788dee0a95
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net/atm/mpc.c
View file

@ -286,33 +286,32 @@ static void start_mpc(struct mpoa_client *mpc, struct net_device *dev)
{ {
dprintk("mpoa: (%s) start_mpc:\n", mpc->dev->name); dprintk("mpoa: (%s) start_mpc:\n", mpc->dev->name);
if (dev->hard_start_xmit == NULL) { if (!dev->netdev_ops)
printk("mpoa: (%s) start_mpc: dev->hard_start_xmit == NULL, not starting\n", printk("mpoa: (%s) start_mpc not starting\n", dev->name);
dev->name); else {
return; mpc->old_ops = dev->netdev_ops;
mpc->new_ops = *mpc->old_ops;
mpc->new_ops.ndo_start_xmit = mpc_send_packet;
dev->netdev_ops = &mpc->new_ops;
} }
mpc->old_hard_start_xmit = dev->hard_start_xmit;
dev->hard_start_xmit = mpc_send_packet;
return;
} }
static void stop_mpc(struct mpoa_client *mpc) static void stop_mpc(struct mpoa_client *mpc)
{ {
struct net_device *dev = mpc->dev;
dprintk("mpoa: (%s) stop_mpc:", mpc->dev->name); dprintk("mpoa: (%s) stop_mpc:", mpc->dev->name);
/* Lets not nullify lec device's dev->hard_start_xmit */ /* Lets not nullify lec device's dev->hard_start_xmit */
if (mpc->dev->hard_start_xmit != mpc_send_packet) { if (dev->netdev_ops != &mpc->new_ops) {
dprintk(" mpc already stopped, not fatal\n"); dprintk(" mpc already stopped, not fatal\n");
return; return;
} }
dprintk("\n"); dprintk("\n");
mpc->dev->hard_start_xmit = mpc->old_hard_start_xmit;
mpc->old_hard_start_xmit = NULL;
/* close_shortcuts(mpc); ??? FIXME */
return; dev->netdev_ops = mpc->old_ops;
mpc->old_ops = NULL;
/* close_shortcuts(mpc); ??? FIXME */
} }
static const char *mpoa_device_type_string(char type) __attribute__ ((unused)); static const char *mpoa_device_type_string(char type) __attribute__ ((unused));
@ -531,7 +530,6 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
*/ */
static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev) static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
{ {
int retval;
struct mpoa_client *mpc; struct mpoa_client *mpc;
struct ethhdr *eth; struct ethhdr *eth;
int i = 0; int i = 0;
@ -561,9 +559,7 @@ static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
} }
non_ip: non_ip:
retval = mpc->old_hard_start_xmit(skb,dev); return mpc->old_ops->ndo_start_xmit(skb,dev);
return retval;
} }
static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg) static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)

5
net/atm/mpc.h
View file

@ -15,7 +15,7 @@ struct mpoa_client {
struct mpoa_client *next; struct mpoa_client *next;
struct net_device *dev; /* lec in question */ struct net_device *dev; /* lec in question */
int dev_num; /* e.g. 2 for lec2 */ int dev_num; /* e.g. 2 for lec2 */
int (*old_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev);
struct atm_vcc *mpoad_vcc; /* control channel to mpoad */ struct atm_vcc *mpoad_vcc; /* control channel to mpoad */
uint8_t mps_ctrl_addr[ATM_ESA_LEN]; /* MPS control ATM address */ uint8_t mps_ctrl_addr[ATM_ESA_LEN]; /* MPS control ATM address */
uint8_t our_ctrl_addr[ATM_ESA_LEN]; /* MPC's control ATM address */ uint8_t our_ctrl_addr[ATM_ESA_LEN]; /* MPC's control ATM address */
@ -31,6 +31,9 @@ struct mpoa_client {
uint8_t *mps_macs; /* array of MPS MAC addresses, >=1 */ uint8_t *mps_macs; /* array of MPS MAC addresses, >=1 */
int number_of_mps_macs; /* number of the above MAC addresses */ int number_of_mps_macs; /* number of the above MAC addresses */
struct mpc_parameters parameters; /* parameters for this client */ struct mpc_parameters parameters; /* parameters for this client */
const struct net_device_ops *old_ops;
struct net_device_ops new_ops;
}; };