summaryrefslogtreecommitdiff
path: root/bpfc
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-05-31 11:21:55 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-05-31 11:21:55 +0200
commita75bad23ef43e05715e0bbf57bb24f682c1bdd13 (patch)
treec30eff3f1dcf1d467666ed403fa1c093397540cc /bpfc
parent2f39b007d5382d01fc424e22b8e1a3681c2bc8cf (diff)
ring: fix wrong error message text in __get_sockopt_tpacket
Arg, this was a leftover when copying the other function. So fix it! Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'bpfc')
0 files changed, 0 insertions, 0 deletions
x/net-next.git/commit/net/strparser/strparser.c?h=nds-private-remove&id=3b4f18843e511193e7eb616710e838f5852e661d'>3b4f18843e511193e7eb616710e838f5852e661d (diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'net/strparser/strparser.c')