aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/phonet/pn_dev.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 07:59:05 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 07:59:05 -0500
commit163849ea9b4c5d50fbd324692461983d18faadad (patch)
tree7176a18fea53560eb4092aa103d94a266ab4e60d /include/net/phonet/pn_dev.h
parent2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff)
parent5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff)
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/net/phonet/pn_dev.h')
-rw-r--r--include/net/phonet/pn_dev.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index 44c923c9e21d..d7b989ca3d63 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -25,7 +25,7 @@
25 25
26struct phonet_device_list { 26struct phonet_device_list {
27 struct list_head list; 27 struct list_head list;
28 spinlock_t lock; 28 struct mutex lock;
29}; 29};
30 30
31struct phonet_device_list *phonet_device_list(struct net *net); 31struct phonet_device_list *phonet_device_list(struct net *net);
@@ -47,6 +47,12 @@ u8 phonet_address_get(struct net_device *dev, u8 addr);
47int phonet_address_lookup(struct net *net, u8 addr); 47int phonet_address_lookup(struct net *net, u8 addr);
48void phonet_address_notify(int event, struct net_device *dev, u8 addr); 48void phonet_address_notify(int event, struct net_device *dev, u8 addr);
49 49
50int phonet_route_add(struct net_device *dev, u8 daddr);
51int phonet_route_del(struct net_device *dev, u8 daddr);
52void rtm_phonet_notify(int event, struct net_device *dev, u8 dst);
53struct net_device *phonet_route_get(struct net *net, u8 daddr);
54struct net_device *phonet_route_output(struct net *net, u8 daddr);
55
50#define PN_NO_ADDR 0xff 56#define PN_NO_ADDR 0xff
51 57
52extern const struct file_operations pn_sock_seq_fops; 58extern const struct file_operations pn_sock_seq_fops;