diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 15:13:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 15:13:53 -0700 |
| commit | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab (patch) | |
| tree | c671df0bd9fa1a13da69ec57e3fdda1385e59729 /net/ax25/ax25_in.c | |
| parent | 2c87e2cd0b57f63c226cd51f55ccc36867541a24 (diff) | |
| parent | 9faefb6d41f770e9cebad0fa180e7e78ef861211 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[DCCP]: Fix sparse warnings.
[TCP]: Remove TCP Compound
[BPQ] lockdep: fix false positive
[IPV4] inetpeer: Get rid of volatile from peer_total
[AX.25]: Get rid of the last volatile.
Diffstat (limited to 'net/ax25/ax25_in.c')
| -rw-r--r-- | net/ax25/ax25_in.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 4cf87540fb3a..e9d94291581e 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -102,8 +102,8 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb) int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) { int (*func)(struct sk_buff *, ax25_cb *); - volatile int queued = 0; unsigned char pid; + int queued = 0; if (skb == NULL) return 0; |