Commit 5fdf1128 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netfilter: replace old NF_ARP calls with NFPROTO_ARP
  netfilter: fix compilation error with NAT=n
  netfilter: xt_recent: use proc_create_data()
  netfilter: snmp nat leaks memory in case of failure
  netfilter: xt_iprange: fix range inversion match
  netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array
  netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig
  pkt_sched: sch_generic: Fix oops in sch_teql
  dccp: Port redirection support for DCCP
  tcp: Fix IPv6 fallout from 'Port redirection support for TCP'
  netdev: change name dropping error codes
  ipvs: Update CONFIG_IP_VS_IPV6 description and help text
parents 2be508d8 fdc9314c

include/net/netns/x_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#define __NETNS_X_TABLES_H



#include <linux/list.h>

#include <linux/net.h>

#include <linux/netfilter.h>



struct netns_xt {

	struct list_head tables[NPROTO];

	struct list_head tables[NFPROTO_NUMPROTO];

};

#endif

net/bridge/br_netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff *skb, 
		return NF_ACCEPT;

	}

	*d = (struct net_device *)in;

	NF_HOOK(NF_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in,

	NF_HOOK(NFPROTO_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in,

		(struct net_device *)out, br_nf_forward_finish);



	return NF_STOLEN;

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -924,10 +924,10 @@ int dev_change_name(struct net_device *dev, const char *newname) 
		strlcpy(dev->name, newname, IFNAMSIZ);



rollback:

	err = device_rename(&dev->dev, dev->name);

	if (err) {

	ret = device_rename(&dev->dev, dev->name);

	if (ret) {

		memcpy(dev->name, oldname, IFNAMSIZ);

		return err;

		return ret;

	}



	write_lock_bh(&dev_base_lock);

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) 
	fl.fl6_flowlabel = 0;

	fl.oif = ireq6->iif;

	fl.fl_ip_dport = inet_rsk(req)->rmt_port;

	fl.fl_ip_sport = inet_sk(sk)->sport;

	fl.fl_ip_sport = inet_rsk(req)->loc_port;

	security_req_classify_flow(req, &fl);



	opt = np->opt;
@@ -558,7 +558,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr);

		fl.oif = sk->sk_bound_dev_if;

		fl.fl_ip_dport = inet_rsk(req)->rmt_port;

		fl.fl_ip_sport = inet_sk(sk)->sport;

		fl.fl_ip_sport = inet_rsk(req)->loc_port;

		security_sk_classify_flow(sk, &fl);



		if (ip6_dst_lookup(sk, &dst, &fl))

net/dccp/minisocks.c

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ void dccp_reqsk_init(struct request_sock *req, struct sk_buff *skb) 
	struct dccp_request_sock *dreq = dccp_rsk(req);



	inet_rsk(req)->rmt_port	  = dccp_hdr(skb)->dccph_sport;

	inet_rsk(req)->loc_port	  = dccp_hdr(skb)->dccph_dport;

	inet_rsk(req)->acked	  = 0;

	req->rcv_wnd		  = sysctl_dccp_feat_sequence_window;

	dreq->dreq_timestamp_echo = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE