Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / drivers / isdn / i4l / isdn_net.c

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 2a7d17c..48e9cc0 100644 (file)
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1678,7 +1678,6 @@ isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb)
        u32 your_seq;
        __be32 local;
        __be32 *addr, *mask;
-       u16 unused;
 
        if (skb->len < 14)
                return;
@@ -1722,7 +1721,6 @@ isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb)
                lp->cisco_last_slarp_in = jiffies;
                my_seq = be32_to_cpup((__be32 *)(p + 0));
                your_seq = be32_to_cpup((__be32 *)(p + 4));
-               unused = be16_to_cpup((__be16 *)(p + 8));
                p += 10;
                lp->cisco_yourseq = my_seq;
                lp->cisco_mineseen = your_seq;
@@ -1985,13 +1983,14 @@ isdn_net_rebuild_header(struct sk_buff *skb)
        return ret;
 }
 
-static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh)
+static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh,
+                            __be16 type)
 {
        const struct net_device *dev = neigh->dev;
        isdn_net_local *lp = netdev_priv(dev);
 
        if (lp->p_encap == ISDN_NET_ENCAP_ETHER)
-               return eth_header_cache(neigh, hh);
+               return eth_header_cache(neigh, hh, type);
        return -1;
 }