aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/net.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-13 02:28:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-13 05:29:59 -0400
commite69dd336ee3a05a589629b505b18ba5e7a5b4c54 (patch)
treece221d370029164d5ea498ab0da50672d03a5b0e /drivers/firewire/net.c
parent3769cffb1c48f64640ffab7ce3bffe867342c0f0 (diff)
net: Push protocol type directly down to header_ops->cache()
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firewire/net.c')
-rw-r--r--drivers/firewire/net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index b9762d07198d..eced1c25bf58 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -261,16 +261,16 @@ static int fwnet_header_rebuild(struct sk_buff *skb)
261} 261}
262 262
263static int fwnet_header_cache(const struct neighbour *neigh, 263static int fwnet_header_cache(const struct neighbour *neigh,
264 struct hh_cache *hh) 264 struct hh_cache *hh, __be16 type)
265{ 265{
266 struct net_device *net; 266 struct net_device *net;
267 struct fwnet_header *h; 267 struct fwnet_header *h;
268 268
269 if (hh->hh_type == cpu_to_be16(ETH_P_802_3)) 269 if (type == cpu_to_be16(ETH_P_802_3))
270 return -1; 270 return -1;
271 net = neigh->dev; 271 net = neigh->dev;
272 h = (struct fwnet_header *)((u8 *)hh->hh_data + 16 - sizeof(*h)); 272 h = (struct fwnet_header *)((u8 *)hh->hh_data + 16 - sizeof(*h));
273 h->h_proto = hh->hh_type; 273 h->h_proto = type;
274 memcpy(h->h_dest, neigh->ha, net->addr_len); 274 memcpy(h->h_dest, neigh->ha, net->addr_len);
275 hh->hh_len = FWNET_HLEN; 275 hh->hh_len = FWNET_HLEN;
276 276