git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
appletalk
/
ddp.c
diff --git
a/net/appletalk/ddp.c
b/net/appletalk/ddp.c
index
588cbe1
..
123d928
100644
(file)
--- a/
net/appletalk/ddp.c
+++ b/
net/appletalk/ddp.c
@@
-9,6
+9,7
@@
* Wesley Craig <netatalk@umich.edu>
*
* Fixes:
* Wesley Craig <netatalk@umich.edu>
*
* Fixes:
+ * Neil Horman : Added missing device ioctls
* Michael Callahan : Made routing work
* Wesley Craig : Fix probing to listen to a
* passed node id.
* Michael Callahan : Made routing work
* Wesley Craig : Fix probing to listen to a
* passed node id.
@@
-71,20
+72,13
@@
static struct proto_ops atalk_dgram_ops;
\**************************************************************************/
HLIST_HEAD(atalk_sockets);
\**************************************************************************/
HLIST_HEAD(atalk_sockets);
-
rwlock_t atalk_sockets_lock = RW_LOCK_UNLOCKED
;
+
DEFINE_RWLOCK(atalk_sockets_lock)
;
static inline void __atalk_insert_socket(struct sock *sk)
{
sk_add_node(sk, &atalk_sockets);
}
static inline void __atalk_insert_socket(struct sock *sk)
{
sk_add_node(sk, &atalk_sockets);
}
-static inline void atalk_insert_socket(struct sock *sk)
-{
- write_lock_bh(&atalk_sockets_lock);
- __atalk_insert_socket(sk);
- write_unlock_bh(&atalk_sockets_lock);
-}
-
static inline void atalk_remove_socket(struct sock *sk)
{
write_lock_bh(&atalk_sockets_lock);
static inline void atalk_remove_socket(struct sock *sk)
{
write_lock_bh(&atalk_sockets_lock);
@@
-200,10
+194,10
@@
static inline void atalk_destroy_socket(struct sock *sk)
/* Anti-deadlock ordering is atalk_routes_lock --> iface_lock -DaveM */
struct atalk_route *atalk_routes;
/* Anti-deadlock ordering is atalk_routes_lock --> iface_lock -DaveM */
struct atalk_route *atalk_routes;
-
rwlock_t atalk_routes_lock = RW_LOCK_UNLOCKED
;
+
DEFINE_RWLOCK(atalk_routes_lock)
;
struct atalk_iface *atalk_interfaces;
struct atalk_iface *atalk_interfaces;
-
rwlock_t atalk_interfaces_lock = RW_LOCK_UNLOCKED
;
+
DEFINE_RWLOCK(atalk_interfaces_lock)
;
/* For probing devices or in a routerless network */
struct atalk_route atrtr_default;
/* For probing devices or in a routerless network */
struct atalk_route atrtr_default;
@@
-570,7
+564,7
@@
static int atrtr_create(struct rtentry *r, struct net_device *devhint)
retval = -ENOBUFS;
if (!rt)
retval = -ENOBUFS;
if (!rt)
- goto out;
+ goto out
_unlock
;
memset(rt, 0, sizeof(*rt));
rt->next = atalk_routes;
memset(rt, 0, sizeof(*rt));
rt->next = atalk_routes;
@@
-619,7
+613,7
@@
out:
* Called when a device is downed. Just throw away any routes
* via it.
*/
* Called when a device is downed. Just throw away any routes
* via it.
*/
-void atrtr_device_down(struct net_device *dev)
+
static
void atrtr_device_down(struct net_device *dev)
{
struct atalk_route **r = &atalk_routes;
struct atalk_route *tmp;
{
struct atalk_route **r = &atalk_routes;
struct atalk_route *tmp;
@@
-1813,6
+1807,8
@@
static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCSIFHWADDR:
case SIOCGIFFLAGS:
case SIOCSIFFLAGS:
case SIOCSIFHWADDR:
case SIOCGIFFLAGS:
case SIOCSIFFLAGS:
+ case SIOCGIFTXQLEN:
+ case SIOCSIFTXQLEN:
case SIOCGIFMTU:
case SIOCGIFCONF:
case SIOCADDMULTI:
case SIOCGIFMTU:
case SIOCGIFCONF:
case SIOCADDMULTI:
@@
-1861,12
+1857,12
@@
static struct notifier_block ddp_notifier = {
.notifier_call = ddp_device_event,
};
.notifier_call = ddp_device_event,
};
-struct packet_type ltalk_packet_type = {
+st
atic st
ruct packet_type ltalk_packet_type = {
.type = __constant_htons(ETH_P_LOCALTALK),
.func = ltalk_rcv,
};
.type = __constant_htons(ETH_P_LOCALTALK),
.func = ltalk_rcv,
};
-struct packet_type ppptalk_packet_type = {
+st
atic st
ruct packet_type ppptalk_packet_type = {
.type = __constant_htons(ETH_P_PPPTALK),
.func = atalk_rcv,
};
.type = __constant_htons(ETH_P_PPPTALK),
.func = atalk_rcv,
};