diff options
| author | B Sampath Kumar <sampath.kumar@stericsson.com> | 2010-05-18 12:31:45 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:10 -0600 |
| commit | 2e4b6fc47a4468356b46e62fbf0323135e541793 (patch) | |
| tree | 206512cb9bf2df706892dff0c71f0c0f59d8ba51 /include | |
| parent | 0d25cb06a6d687c5c8be3ced71a845569c3a3ced (diff) | |
Updated Phonet Stack with adaptations from v29 to v33 for MBL
Signed-off-by: B Sampath Kumar <sampath.kumar@stericsson.com>
Diffstat (limited to 'include')
| -rwxr-xr-x[-rw-r--r--] | include/linux/phonet.h | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/net/phonet/phonet.h | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/net/phonet/pn_dev.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index e5126cff9b2..d02a191cae6 100644..100755 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h @@ -47,6 +47,7 @@ /* ioctls */ #define SIOCPNGETOBJECT (SIOCPROTOPRIVATE + 0) +#define SIOCPNSETBINDFLAG (SIOCPROTOPRIVATE + 1) /* Phonet protocol header */ struct phonethdr { diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h index 7b114079a51..e4446d56394 100644..100755 --- a/include/net/phonet/phonet.h +++ b/include/net/phonet/phonet.h @@ -47,7 +47,12 @@ static inline struct pn_sock *pn_sk(struct sock *sk) extern const struct proto_ops phonet_dgram_ops; void pn_sock_init(void); +#ifdef PHONET_DEV struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *sa); +#else +struct sock *pn_find_sock_by_sa(/*struct net *net,In 2.6.29*/ \ + const struct sockaddr_pn *sa); +#endif void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb); void phonet_get_local_port_range(int *min, int *max); void pn_sock_hash(struct sock *sk); @@ -110,4 +115,8 @@ void phonet_sysctl_exit(void); int isi_register(void); void isi_unregister(void); +ssize_t isa_write(struct file *filp, const char __user *buf, \ + size_t len, loff_t *ppos); +void phonet_bind_check(int8_t); + #endif diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h index d7b989ca3d6..bb874eb897a 100644..100755 --- a/include/net/phonet/pn_dev.h +++ b/include/net/phonet/pn_dev.h @@ -44,7 +44,9 @@ struct net_device *phonet_device_get(struct net *net); int phonet_address_add(struct net_device *dev, u8 addr); int phonet_address_del(struct net_device *dev, u8 addr); u8 phonet_address_get(struct net_device *dev, u8 addr); +#ifdef PHONET_DEV int phonet_address_lookup(struct net *net, u8 addr); +#endif void phonet_address_notify(int event, struct net_device *dev, u8 addr); int phonet_route_add(struct net_device *dev, u8 daddr); |