diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2010-05-06 01:33:53 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-05-15 23:48:02 -0700 |
| commit | a14462f1bd4d3962994f518459102000438665aa (patch) | |
| tree | 309eda1cd2698a5224713e43173edbd640f4487f /drivers/net/macvlan.c | |
| parent | skge: use the DMA state API instead of the pci equivalents (diff) | |
| download | linux-dev-a14462f1bd4d3962994f518459102000438665aa.tar.xz linux-dev-a14462f1bd4d3962994f518459102000438665aa.zip | |
net: adjust handle_macvlan to pass port struct to hook
Now there's null check here and also again in the hook. Looking at bridge bits
which are simmilar, port structure is rcu_dereferenced right away in
handle_bridge and passed to hook. Looks nicer.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 9a939d828b47..1b78c0057a8d 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -145,19 +145,15 @@ static void macvlan_broadcast(struct sk_buff *skb, } /* called under rcu_read_lock() from netif_receive_skb */ -static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb) +static struct sk_buff *macvlan_handle_frame(struct macvlan_port *port, + struct sk_buff *skb) { const struct ethhdr *eth = eth_hdr(skb); - const struct macvlan_port *port; const struct macvlan_dev *vlan; const struct macvlan_dev *src; struct net_device *dev; unsigned int len; - port = rcu_dereference(skb->dev->macvlan_port); - if (port == NULL) - return skb; - if (is_multicast_ether_addr(eth->h_dest)) { src = macvlan_hash_lookup(port, eth->h_source); if (!src) |