projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Also accept NXAST_DROP_SPOOFED_ARP.
[openvswitch]
/
datapath
/
vport-capwap.c
diff --git
a/datapath/vport-capwap.c
b/datapath/vport-capwap.c
index 59fb05100a085535f1c2da6d6b2a02dd9f041ead..7ae3790d76fae949307ecffaae7c56aca6a6f000 100644
(file)
--- a/
datapath/vport-capwap.c
+++ b/
datapath/vport-capwap.c
@@
-6,6
+6,8
@@
* kernel, by Linus Torvalds and others.
*/
* kernel, by Linus Torvalds and others.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
@@
-19,6
+21,7
@@
#include <net/inet_frag.h>
#include <net/ip.h>
#include <net/protocol.h>
#include <net/inet_frag.h>
#include <net/ip.h>
#include <net/protocol.h>
+#include <net/udp.h>
#include "tunnel.h"
#include "vport.h"
#include "tunnel.h"
#include "vport.h"
@@
-160,7
+163,7
@@
static inline struct sk_buff *process_capwap_proto(struct sk_buff *skb)
return defrag(skb, true);
else {
if (net_ratelimit())
return defrag(skb, true);
else {
if (net_ratelimit())
- pr
intk(KERN_WARNING "openvswitch:
unparsable packet receive on capwap socket\n");
+ pr
_warn("
unparsable packet receive on capwap socket\n");
kfree_skb(skb);
return NULL;
kfree_skb(skb);
return NULL;
@@
-243,7
+246,7
@@
static int capwap_init(void)
error_sock:
sock_release(capwap_rcv_socket);
error:
error_sock:
sock_release(capwap_rcv_socket);
error:
- pr
intk(KERN_WARNING "openvswitch:
cannot register capwap protocol handler\n");
+ pr
_warn("
cannot register capwap protocol handler\n");
return err;
}
return err;
}
@@
-288,7
+291,7
@@
static struct sk_buff *fragment(struct sk_buff *skb, const struct vport *vport,
if (hlen + ~FRAG_OFF_MASK + 1 > dst_mtu(dst)) {
if (net_ratelimit())
if (hlen + ~FRAG_OFF_MASK + 1 > dst_mtu(dst)) {
if (net_ratelimit())
- pr
intk(KERN_WARNING "openvswitch:
capwap link mtu (%d) is less than minimum packet (%d)\n",
+ pr
_warn("
capwap link mtu (%d) is less than minimum packet (%d)\n",
dst_mtu(dst), hlen + ~FRAG_OFF_MASK + 1);
goto error;
}
dst_mtu(dst), hlen + ~FRAG_OFF_MASK + 1);
goto error;
}