summaryrefslogtreecommitdiff
path: root/mausezahn
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-08-24 14:46:02 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-08-24 14:46:02 +0200
commitd84a6b7139f3c6d0eb70615543cf368350000e5b (patch)
tree76b9db71792134e364913347c7977fc01723af5a /mausezahn
parent71c28eff00a8a8896c45fa20330b623d265ae5c7 (diff)
netsniff-ng: Use correct flag to check tpacket uhdr validity
When fixing up a build error introduced by commit 579e8524 ("netsniff-ng: vlan: Show vlan info from tpacket v3"), the used definitions got mixed up and TP_STATUS_VLAN_TPID_VALID ended up not being checked at all. Fix this up and make the code a bit easier to read Fixes: 3384ee71 ("netsniff-ng: ring: Fix build if tp_vlan_tpid is not available in kernel header") Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'mausezahn')
0 files changed, 0 insertions, 0 deletions
ea013a29ac1&id2=951d77fd5a541d68eeb7372e72cd4757e3058517'>diff)
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "Two straightforward fixes. One is a concurrency issue only affecting SAS connected SATA drives, but which could hang the storage subsystem if it triggers (because the outstanding command count on error never goes back to zero) and the other is a NO_TAG fallout from the switch to hostwide tags which causes the system to crash on module insertion (we've checked carefully and only the 53c700 family of drivers is vulnerable to this issue)" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: 53c700: fix BUG on untagged commands scsi: fix race between simultaneous decrements of ->host_failed
Diffstat (limited to 'Documentation/w1/masters')