diff options
| author | David Daney | 2009-06-23 20:34:08 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2009-06-24 19:34:41 +0200 |
| commit | f696a10838ffab85e5bc07e7cff0d0e1870a30d7 (patch) | |
| tree | cacbd78fdf71fd77b6f8ff5067a7d0e4306824be /drivers/staging/octeon/ethernet-tx.c | |
| parent | MIPS: Cavium: Add CPU hotplugging code. (diff) | |
| download | kernel-qcow2-linux-f696a10838ffab85e5bc07e7cff0d0e1870a30d7.tar.gz kernel-qcow2-linux-f696a10838ffab85e5bc07e7cff0d0e1870a30d7.tar.xz kernel-qcow2-linux-f696a10838ffab85e5bc07e7cff0d0e1870a30d7.zip | |
Staging: octeon-ethernet: Convert to use net_device_ops.
Convert the driver to use net_device_ops as it is now mandatory.
Also compensate for the removal of struct sk_buff's dst field.
The changes are mostly mechanical, the content of ethernet-common.c
was moved to ethernet.c and ethernet-common.{c,h} are removed.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet-tx.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 77b7122c8fdb..bfd3dd2fcef8 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -253,10 +253,10 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) /* * The skbuff will be reused without ever being freed. We must - * cleanup a bunch of Linux stuff. + * cleanup a bunch of core things. */ - dst_release(skb->dst); - skb->dst = NULL; + dst_release(skb_dst(skb)); + skb_dst_set(skb, NULL); #ifdef CONFIG_XFRM secpath_put(skb->sp); skb->sp = NULL; |