diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 11:06:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 11:06:56 -0700 |
| commit | 3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f (patch) | |
| tree | 5539ec43768de877137c1971502a5e69cd9f0836 /include | |
| parent | a4cce10492358b33d33bb43f98284c80482037e8 (diff) | |
| parent | dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42 (diff) | |
| download | linux-3.10-3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f.tar.gz linux-3.10-3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f.tar.bz2 linux-3.10-3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ax25.h | 18 | ||||
| -rw-r--r-- | include/net/sock.h | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 828a3a93dda..3696f988a9f 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -139,11 +139,25 @@ enum { #define AX25_DEF_DS_TIMEOUT (3 * 60 * HZ) /* DAMA timeout 3 minutes */ typedef struct ax25_uid_assoc { - struct ax25_uid_assoc *next; + struct hlist_node uid_node; + atomic_t refcount; uid_t uid; ax25_address call; } ax25_uid_assoc; +#define ax25_uid_for_each(__ax25, node, list) \ + hlist_for_each_entry(__ax25, node, list, uid_node) + +#define ax25_uid_hold(ax25) \ + atomic_inc(&((ax25)->refcount)) + +static inline void ax25_uid_put(ax25_uid_assoc *assoc) +{ + if (atomic_dec_and_test(&assoc->refcount)) { + kfree(assoc); + } +} + typedef struct { ax25_address calls[AX25_MAX_DIGIS]; unsigned char repeated[AX25_MAX_DIGIS]; @@ -376,7 +390,7 @@ extern unsigned long ax25_display_timer(struct timer_list *); /* ax25_uid.c */ extern int ax25_uid_policy; -extern ax25_address *ax25_findbyuid(uid_t); +extern ax25_uid_assoc *ax25_findbyuid(uid_t); extern int ax25_uid_ioctl(int, struct sockaddr_ax25 *); extern struct file_operations ax25_uid_fops; extern void ax25_uid_free(void); diff --git a/include/net/sock.h b/include/net/sock.h index a1042d08bec..e9b1dbab90d 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -384,6 +384,11 @@ enum sock_flags { SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */ }; +static inline void sock_copy_flags(struct sock *nsk, struct sock *osk) +{ + nsk->sk_flags = osk->sk_flags; +} + static inline void sock_set_flag(struct sock *sk, enum sock_flags flag) { __set_bit(flag, &sk->sk_flags); |