diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /net/packet | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 9454d4ae46df..1fc4a7885c41 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -222,13 +222,13 @@ static void *packet_lookup_frame(struct packet_sock *po, unsigned int position, | |||
| 222 | h.raw = po->pg_vec[pg_vec_pos] + (frame_offset * po->frame_size); | 222 | h.raw = po->pg_vec[pg_vec_pos] + (frame_offset * po->frame_size); |
| 223 | switch (po->tp_version) { | 223 | switch (po->tp_version) { |
| 224 | case TPACKET_V1: | 224 | case TPACKET_V1: |
| 225 | if (status != h.h1->tp_status ? TP_STATUS_USER : | 225 | if (status != (h.h1->tp_status ? TP_STATUS_USER : |
| 226 | TP_STATUS_KERNEL) | 226 | TP_STATUS_KERNEL)) |
| 227 | return NULL; | 227 | return NULL; |
| 228 | break; | 228 | break; |
| 229 | case TPACKET_V2: | 229 | case TPACKET_V2: |
| 230 | if (status != h.h2->tp_status ? TP_STATUS_USER : | 230 | if (status != (h.h2->tp_status ? TP_STATUS_USER : |
| 231 | TP_STATUS_KERNEL) | 231 | TP_STATUS_KERNEL)) |
| 232 | return NULL; | 232 | return NULL; |
| 233 | break; | 233 | break; |
| 234 | } | 234 | } |