diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-13 02:28:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-13 05:29:59 -0400 |
commit | e69dd336ee3a05a589629b505b18ba5e7a5b4c54 (patch) | |
tree | ce221d370029164d5ea498ab0da50672d03a5b0e /drivers/isdn | |
parent | 3769cffb1c48f64640ffab7ce3bffe867342c0f0 (diff) |
net: Push protocol type directly down to header_ops->cache()
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 97988111e45a..48e9cc0369b1 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -1983,13 +1983,14 @@ isdn_net_rebuild_header(struct sk_buff *skb) | |||
1983 | return ret; | 1983 | return ret; |
1984 | } | 1984 | } |
1985 | 1985 | ||
1986 | static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh) | 1986 | static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh, |
1987 | __be16 type) | ||
1987 | { | 1988 | { |
1988 | const struct net_device *dev = neigh->dev; | 1989 | const struct net_device *dev = neigh->dev; |
1989 | isdn_net_local *lp = netdev_priv(dev); | 1990 | isdn_net_local *lp = netdev_priv(dev); |
1990 | 1991 | ||
1991 | if (lp->p_encap == ISDN_NET_ENCAP_ETHER) | 1992 | if (lp->p_encap == ISDN_NET_ENCAP_ETHER) |
1992 | return eth_header_cache(neigh, hh); | 1993 | return eth_header_cache(neigh, hh, type); |
1993 | return -1; | 1994 | return -1; |
1994 | } | 1995 | } |
1995 | 1996 | ||