diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 11:25:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 11:25:16 -0700 |
| commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
| tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /include/net | |
| parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
| parent | e71180f3689e00c5a1095925352a72dacdd62e34 (diff) | |
| download | op-kernel-dev-62d3af1b5f3aa613e0a489e8d798d45b07f373f4.zip op-kernel-dev-62d3af1b5f3aa613e0a489e8d798d45b07f373f4.tar.gz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ax25.h | 3 | ||||
| -rw-r--r-- | include/net/netrom.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 30bb4a8..2250a18 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -237,8 +237,7 @@ typedef struct ax25_cb { static __inline__ void ax25_cb_put(ax25_cb *ax25) { if (atomic_dec_and_test(&ax25->refcount)) { - if (ax25->digipeat) - kfree(ax25->digipeat); + kfree(ax25->digipeat); kfree(ax25); } } diff --git a/include/net/netrom.h b/include/net/netrom.h index a6bf6e0..a5ee53b 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h @@ -136,8 +136,7 @@ static __inline__ void nr_node_put(struct nr_node *nr_node) static __inline__ void nr_neigh_put(struct nr_neigh *nr_neigh) { if (atomic_dec_and_test(&nr_neigh->refcount)) { - if (nr_neigh->digipeat != NULL) - kfree(nr_neigh->digipeat); + kfree(nr_neigh->digipeat); kfree(nr_neigh); } } |
