Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d312c8f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: nf_conntrack_pptp: fix NAT setup of expected GRE connections
  [NETFILTER]: nf_nat_pptp: fix expectation removal
  [NETFILTER]: nf_nat: fix ICMP translation with statically linked conntrack
  [TCP]: Restore SKB socket owner setting in tcp_transmit_skb().
  [AF_PACKET]: Check device down state before hard header callbacks.
  [DECNET]: Handle a failure in neigh_parms_alloc (take 2)
  [BNX2]: Fix 2nd port's MAC address.
  [TCP]: Fix sorting of SACK blocks.
  [AF_PACKET]: Fix BPF handling.
  [IPV4]: Fix the fib trie iterator to work with a single entry routing tables
parents 08eacc31 7399072a

drivers/net/bnx2.c

+7 −5
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.5.3"

#define DRV_MODULE_RELDATE	"January 8, 2007"

#define DRV_MODULE_VERSION	"1.5.4"

#define DRV_MODULE_RELDATE	"January 24, 2007"



#define RUN_AT(x) (jiffies + (x))
@@ -5845,9 +5845,11 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
	reg = REG_RD_IND(bp, BNX2_SHM_HDR_SIGNATURE);



	if ((reg & BNX2_SHM_HDR_SIGNATURE_SIG_MASK) ==

	    BNX2_SHM_HDR_SIGNATURE_SIG)

		bp->shmem_base = REG_RD_IND(bp, BNX2_SHM_HDR_ADDR_0);

	else

	    BNX2_SHM_HDR_SIGNATURE_SIG) {

		u32 off = PCI_FUNC(pdev->devfn) << 2;



		bp->shmem_base = REG_RD_IND(bp, BNX2_SHM_HDR_ADDR_0 + off);

	} else

		bp->shmem_base = HOST_VIEW_SHMEM_BASE;



	/* Get the permanent MAC address.  First we need to make sure the

include/net/inet6_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ extern void inet6_csk_reqsk_queue_hash_add(struct sock *sk, 


extern void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);



extern int inet6_csk_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok);

extern int inet6_csk_xmit(struct sk_buff *skb, int ipfragok);

#endif /* _INET6_CONNECTION_SOCK_H */

include/net/inet_connection_sock.h

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ struct tcp_congestion_ops; 
 * (i.e. things that depend on the address family)

 */

struct inet_connection_sock_af_ops {

	int	    (*queue_xmit)(struct sk_buff *skb, struct sock *sk,

				  int ipfragok);

	int	    (*queue_xmit)(struct sk_buff *skb, int ipfragok);

	void	    (*send_check)(struct sock *sk, int len,

				  struct sk_buff *skb);

	int	    (*rebuild_header)(struct sock *sk);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ extern int ip_mc_output(struct sk_buff *skb); 
extern int		ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));

extern int		ip_do_nat(struct sk_buff *skb);

extern void		ip_send_check(struct iphdr *ip);

extern int		ip_queue_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok);

extern int		ip_queue_xmit(struct sk_buff *skb, int ipfragok);

extern void		ip_init(void);

extern int		ip_append_data(struct sock *sk,

				       int getfrag(void *from, char *to, int offset, int len,

net/dccp/output.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) 
		DCCP_INC_STATS(DCCP_MIB_OUTSEGS);



		memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));

		err = icsk->icsk_af_ops->queue_xmit(skb, sk, 0);

		err = icsk->icsk_af_ops->queue_xmit(skb, 0);

		return net_xmit_eval(err);

	}

	return -ENOBUFS;
@@ -396,7 +396,7 @@ int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code) 
						      code);

		if (skb != NULL) {

			memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));

			err = inet_csk(sk)->icsk_af_ops->queue_xmit(skb, sk, 0);

			err = inet_csk(sk)->icsk_af_ops->queue_xmit(skb, 0);

			return net_xmit_eval(err);

		}

	}