projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtlwifi: rtl8821ae: Make sure loop counter is signed on all architectures
[deliverable/linux.git]
/
drivers
/
net
/
geneve.c
diff --git
a/drivers/net/geneve.c
b/drivers/net/geneve.c
index bc168894bda32d0723f7d77aa475f59bd2c7d75a..a9fbf17eb256f8b8c648087625286fd5fc7173c0 100644
(file)
--- a/
drivers/net/geneve.c
+++ b/
drivers/net/geneve.c
@@
-87,7
+87,6
@@
struct geneve_sock {
struct socket *sock;
struct rcu_head rcu;
int refcnt;
struct socket *sock;
struct rcu_head rcu;
int refcnt;
- struct udp_offload udp_offloads;
struct hlist_head vni_list[VNI_HASH_SIZE];
u32 flags;
};
struct hlist_head vni_list[VNI_HASH_SIZE];
u32 flags;
};
@@
-409,14
+408,6
@@
static void geneve_notify_add_rx_port(struct geneve_sock *gs)
struct net *net = sock_net(sk);
sa_family_t sa_family = geneve_get_sk_family(gs);
__be16 port = inet_sk(sk)->inet_sport;
struct net *net = sock_net(sk);
sa_family_t sa_family = geneve_get_sk_family(gs);
__be16 port = inet_sk(sk)->inet_sport;
- int err;
-
- if (sa_family == AF_INET) {
- err = udp_add_offload(sock_net(sk), &gs->udp_offloads);
- if (err)
- pr_warn("geneve: udp_add_offload failed with status %d\n",
- err);
- }
rcu_read_lock();
for_each_netdev_rcu(net, dev) {
rcu_read_lock();
for_each_netdev_rcu(net, dev) {
@@
-432,9
+423,9
@@
static int geneve_hlen(struct genevehdr *gh)
return sizeof(*gh) + gh->opt_len * 4;
}
return sizeof(*gh) + gh->opt_len * 4;
}
-static struct sk_buff **geneve_gro_receive(struct s
k_buff **head
,
- struct sk_buff *
skb
,
- struct
udp_offload *uoff
)
+static struct sk_buff **geneve_gro_receive(struct s
ock *sk
,
+ struct sk_buff *
*head
,
+ struct
sk_buff *skb
)
{
struct sk_buff *p, **pp = NULL;
struct genevehdr *gh, *gh2;
{
struct sk_buff *p, **pp = NULL;
struct genevehdr *gh, *gh2;
@@
-495,8
+486,8
@@
out:
return pp;
}
return pp;
}
-static int geneve_gro_complete(struct s
k_buff *skb, int nhoff
,
-
struct udp_offload *u
off)
+static int geneve_gro_complete(struct s
ock *sk, struct sk_buff *skb
,
+
int nh
off)
{
struct genevehdr *gh;
struct packet_offload *ptype;
{
struct genevehdr *gh;
struct packet_offload *ptype;
@@
-545,14
+536,14
@@
static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,
INIT_HLIST_HEAD(&gs->vni_list[h]);
/* Initialize the geneve udp offloads structure */
INIT_HLIST_HEAD(&gs->vni_list[h]);
/* Initialize the geneve udp offloads structure */
- gs->udp_offloads.port = port;
- gs->udp_offloads.callbacks.gro_receive = geneve_gro_receive;
- gs->udp_offloads.callbacks.gro_complete = geneve_gro_complete;
geneve_notify_add_rx_port(gs);
/* Mark socket as an encapsulation socket */
geneve_notify_add_rx_port(gs);
/* Mark socket as an encapsulation socket */
+ memset(&tunnel_cfg, 0, sizeof(tunnel_cfg));
tunnel_cfg.sk_user_data = gs;
tunnel_cfg.encap_type = 1;
tunnel_cfg.sk_user_data = gs;
tunnel_cfg.encap_type = 1;
+ tunnel_cfg.gro_receive = geneve_gro_receive;
+ tunnel_cfg.gro_complete = geneve_gro_complete;
tunnel_cfg.encap_rcv = geneve_udp_encap_recv;
tunnel_cfg.encap_destroy = NULL;
setup_udp_tunnel_sock(net, sock, &tunnel_cfg);
tunnel_cfg.encap_rcv = geneve_udp_encap_recv;
tunnel_cfg.encap_destroy = NULL;
setup_udp_tunnel_sock(net, sock, &tunnel_cfg);
@@
-576,9
+567,6
@@
static void geneve_notify_del_rx_port(struct geneve_sock *gs)
}
rcu_read_unlock();
}
rcu_read_unlock();
-
- if (sa_family == AF_INET)
- udp_del_offload(&gs->udp_offloads);
}
static void __geneve_sock_release(struct geneve_sock *gs)
}
static void __geneve_sock_release(struct geneve_sock *gs)
This page took
0.043611 seconds
and
5
git commands to generate.