Applied assortment of Arch Linux ARM patches
This commit is contained in:
@@ -338,7 +338,8 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
be32_to_cpu(tunnel->parms.o_key), RT_TOS(tos),
|
||||
RT_SCOPE_UNIVERSE,
|
||||
IPPROTO_IPIP, 0,
|
||||
dst, tiph->saddr, 0, 0);
|
||||
dst, tiph->saddr, 0, 0,
|
||||
sock_net_uid(dev_net(dev), NULL));
|
||||
rt = ip_route_output_key(dev_net(dev), &fl4);
|
||||
if (IS_ERR(rt)) {
|
||||
dev->stats.tx_carrier_errors++;
|
||||
@@ -404,7 +405,8 @@ static int vti_tunnel_bind_dev(struct net_device *dev)
|
||||
be32_to_cpu(tunnel->parms.i_key),
|
||||
RT_TOS(iph->tos), RT_SCOPE_UNIVERSE,
|
||||
IPPROTO_IPIP, 0,
|
||||
iph->daddr, iph->saddr, 0, 0);
|
||||
iph->daddr, iph->saddr, 0, 0,
|
||||
sock_net_uid(dev_net(dev), NULL));
|
||||
rt = ip_route_output_key(dev_net(dev), &fl4);
|
||||
if (!IS_ERR(rt)) {
|
||||
tdev = rt->dst.dev;
|
||||
|
||||
@@ -83,7 +83,7 @@ nfnl_cthelper_parse_tuple(struct nf_conntrack_tuple *tuple,
|
||||
static int
|
||||
nfnl_cthelper_from_nlattr(struct nlattr *attr, struct nf_conn *ct)
|
||||
{
|
||||
const struct nf_conn_help *help = nfct_help(ct);
|
||||
struct nf_conn_help *help = nfct_help(ct);
|
||||
|
||||
if (attr == NULL)
|
||||
return -EINVAL;
|
||||
@@ -91,7 +91,7 @@ nfnl_cthelper_from_nlattr(struct nlattr *attr, struct nf_conn *ct)
|
||||
if (help->helper->data_len == 0)
|
||||
return -EINVAL;
|
||||
|
||||
memcpy(&help->data, nla_data(attr), help->helper->data_len);
|
||||
memcpy(help->data, nla_data(attr), help->helper->data_len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user