git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging: rt2860: use new hex_to_bin() method
[safe/jmp/linux-2.6]
/
net
/
dsa
/
tag_trailer.c
diff --git
a/net/dsa/tag_trailer.c
b/net/dsa/tag_trailer.c
index
a6d959d
..
d6d7d0a
100644
(file)
--- a/
net/dsa/tag_trailer.c
+++ b/
net/dsa/tag_trailer.c
@@
-1,6
+1,6
@@
/*
* net/dsa/tag_trailer.c - Trailer tag format handling
/*
* net/dsa/tag_trailer.c - Trailer tag format handling
- * Copyright (c) 2008 Marvell Semiconductor
+ * Copyright (c) 2008
-2009
Marvell Semiconductor
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-11,9
+11,10
@@
#include <linux/etherdevice.h>
#include <linux/list.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/list.h>
#include <linux/netdevice.h>
+#include <linux/slab.h>
#include "dsa_priv.h"
#include "dsa_priv.h"
-
in
t trailer_xmit(struct sk_buff *skb, struct net_device *dev)
+
netdev_tx_
t trailer_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct sk_buff *nskb;
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct sk_buff *nskb;
@@
-59,7
+60,7
@@
int trailer_xmit(struct sk_buff *skb, struct net_device *dev)
nskb->protocol = htons(ETH_P_TRAILER);
nskb->protocol = htons(ETH_P_TRAILER);
- nskb->dev = p->parent->master_netdev;
+ nskb->dev = p->parent->
dst->
master_netdev;
dev_queue_xmit(nskb);
return NETDEV_TX_OK;
dev_queue_xmit(nskb);
return NETDEV_TX_OK;
@@
-68,12
+69,14
@@
int trailer_xmit(struct sk_buff *skb, struct net_device *dev)
static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{
static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{
- struct dsa_switch *ds = dev->dsa_ptr;
+ struct dsa_switch_tree *dst = dev->dsa_ptr;
+ struct dsa_switch *ds;
u8 *trailer;
int source_port;
u8 *trailer;
int source_port;
- if (unlikely(ds == NULL))
+ if (unlikely(ds
t
== NULL))
goto out_drop;
goto out_drop;
+ ds = dst->ds[0];
skb = skb_unshare(skb, GFP_ATOMIC);
if (skb == NULL)
skb = skb_unshare(skb, GFP_ATOMIC);
if (skb == NULL)