diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:22:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:26:56 +1100 |
| commit | c1ea68f0237fc3e8ea5a6c084af9bda6b9a3722c (patch) | |
| tree | 18f1c1a9ec816260ae4576496fa0b40559fb7dfd /include/linux/hippidevice.h | |
| parent | 9a6cf71fa371180543df9f196e93986e37582c81 (diff) | |
| parent | 25f13048bce61f33f6a102e0bf377fd3922ed364 (diff) | |
Merge commit 'net/master'
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'include/linux/hippidevice.h')
| -rw-r--r-- | include/linux/hippidevice.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h index bab303dafd6e..f148e4908410 100644 --- a/include/linux/hippidevice.h +++ b/include/linux/hippidevice.h @@ -32,7 +32,9 @@ struct hippi_cb { }; extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev); - +extern int hippi_change_mtu(struct net_device *dev, int new_mtu); +extern int hippi_mac_addr(struct net_device *dev, void *p); +extern int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p); extern struct net_device *alloc_hippi_dev(int sizeof_priv); #endif |