diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2005-02-15 02:57:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2005-02-15 02:57:38 -0800 |
| commit | 27d75650012896efe35fe150cdfdb21899e6447d (patch) | |
| tree | daa2ca3a59afe22fbef3683594aefc138375424e /include | |
| parent | e90d1cdd41db3025a59ae556bfb7dbdcdd76694f (diff) | |
| parent | 5ff974d98118d600159788c9637d013df8361fa7 (diff) | |
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/socket.h | 2 | ||||
| -rw-r--r-- | include/net/dst.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 769ff4fc01b0..a5c7d96e4d2e 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -120,7 +120,7 @@ struct cmsghdr { * Now it always returns valid, not truncated ancillary object * HEADER. But caller still MUST check, that cmsg->cmsg_len is * inside range, given by msg->msg_controllen before using - * ansillary object DATA. --ANK (980731) + * ancillary object DATA. --ANK (980731) */ __KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size, diff --git a/include/net/dst.h b/include/net/dst.h index d214a5781c17..b7e47a7ad105 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -89,7 +89,8 @@ struct dst_ops int (*gc)(void); struct dst_entry * (*check)(struct dst_entry *, __u32 cookie); void (*destroy)(struct dst_entry *); - void (*ifdown)(struct dst_entry *, int how); + void (*ifdown)(struct dst_entry *, + struct net_device *dev, int how); struct dst_entry * (*negative_advice)(struct dst_entry *); void (*link_failure)(struct sk_buff *); void (*update_pmtu)(struct dst_entry *dst, u32 mtu); |