igb: support for VF configuration tools

[safe/jmp/linux-2.6] / include / net / dn_route.h

diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 76f957e..60c9f22 100644 (file)
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -18,7 +18,6 @@
 extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri);
 extern int dn_route_output_sock(struct dst_entry **pprt, struct flowi *, struct sock *sk, int flags);
 extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
-extern int dn_cache_getroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
 extern void dn_rt_cache_flush(int delay);
 
 /* Masks for flags field */
@@ -68,9 +67,10 @@ extern void dn_rt_cache_flush(int delay);
 struct dn_route {
        union {
                struct dst_entry dst;
-               struct dn_route *rt_next;
        } u;
 
+       struct flowi fl;
+
        __le16 rt_saddr;
        __le16 rt_daddr;
        __le16 rt_gateway;
@@ -80,8 +80,6 @@ struct dn_route {
 
        unsigned rt_flags;
        unsigned rt_type;
-
-       struct flowi fl;
 };
 
 extern void dn_route_init(void);
@@ -102,8 +100,7 @@ static inline void dn_rt_finish_output(struct sk_buff *skb, char *dst, char *src
        if ((dev->type != ARPHRD_ETHER) && (dev->type != ARPHRD_LOOPBACK))
                dst = NULL;
 
-       if (!dev->hard_header || (dev->hard_header(skb, dev, ETH_P_DNA_RT,
-                       dst, src, skb->len) >= 0))
+       if (dev_hard_header(skb, dev, ETH_P_DNA_RT, dst, src, skb->len) >= 0)
                dn_rt_send(skb);
        else
                kfree_skb(skb);