diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-12 23:28:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-13 02:29:59 -0700 |
| commit | e69dd336ee3a05a589629b505b18ba5e7a5b4c54 (patch) | |
| tree | ce221d370029164d5ea498ab0da50672d03a5b0e /drivers/firewire | |
| parent | 3769cffb1c48f64640ffab7ce3bffe867342c0f0 (diff) | |
| download | op-kernel-dev-e69dd336ee3a05a589629b505b18ba5e7a5b4c54.zip op-kernel-dev-e69dd336ee3a05a589629b505b18ba5e7a5b4c54.tar.gz | |
net: Push protocol type directly down to header_ops->cache()
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index b9762d0..eced1c2 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -261,16 +261,16 @@ static int fwnet_header_rebuild(struct sk_buff *skb) } static int fwnet_header_cache(const struct neighbour *neigh, - struct hh_cache *hh) + struct hh_cache *hh, __be16 type) { struct net_device *net; struct fwnet_header *h; - if (hh->hh_type == cpu_to_be16(ETH_P_802_3)) + if (type == cpu_to_be16(ETH_P_802_3)) return -1; net = neigh->dev; h = (struct fwnet_header *)((u8 *)hh->hh_data + 16 - sizeof(*h)); - h->h_proto = hh->hh_type; + h->h_proto = type; memcpy(h->h_dest, neigh->ha, net->addr_len); hh->hh_len = FWNET_HLEN; |
