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

Commit 99b48cff 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:
  [NETLINK]: Put {IFA,IFLA}_{RTA,PAYLOAD} macros back for userspace.
  [NET_SCHED] sch_htb: turn intermediate classes into leaves
  [NET_SCHED] sch_cbq: deactivating when grafting, purging etc.
  [XFRM]: Fix XFRMGRP_REPORT to use correct multicast group.
  [NET]: Force a cache line split in hh_cache in SMP.
  [NETPOLL]: make arp replies through netpoll use mac address of sender
  [NETLINK]: Restore API compatibility of address and neighbour bits
  [AX.25]: Fix default address and broadcast address initialization.
  [AX.25]: Constify ax25 utility functions
  [BNX2]: Add an error check.
  [NET]: Convert hh_lock to seqlock.
parents 200d018e d3dcc077

drivers/net/bnx2.c

+1 −1
Original line number Diff line number Diff line
@@ -2510,7 +2510,7 @@ bnx2_init_cpus(struct bnx2 *bp) 
	if (CHIP_NUM(bp) == CHIP_NUM_5709) {

		fw = &bnx2_cp_fw_09;



		load_cpu_fw(bp, &cpu_reg, fw);

		rc = load_cpu_fw(bp, &cpu_reg, fw);

		if (rc)

			goto init_cpu_err;

	}

drivers/net/hamradio/6pack.c

+2 −7
Original line number Diff line number Diff line
@@ -325,11 +325,6 @@ static int sp_rebuild_header(struct sk_buff *skb) 


static void sp_setup(struct net_device *dev)

{

	static char ax25_bcast[AX25_ADDR_LEN] =

		{'Q'<<1,'S'<<1,'T'<<1,' '<<1,' '<<1,' '<<1,'0'<<1};

	static char ax25_test[AX25_ADDR_LEN] =

		{'L'<<1,'I'<<1,'N'<<1,'U'<<1,'X'<<1,' '<<1,'1'<<1};



	/* Finish setting up the DEVICE info. */

	dev->mtu		= SIXP_MTU;

	dev->hard_start_xmit	= sp_xmit;
@@ -347,8 +342,8 @@ static void sp_setup(struct net_device *dev) 
	dev->tx_timeout		= NULL;



	/* Only activated in AX.25 mode */

	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);



	SET_MODULE_OWNER(dev);

drivers/net/hamradio/baycom_epp.c

+2 −8
Original line number Diff line number Diff line
@@ -1141,12 +1141,6 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
 */

static void baycom_probe(struct net_device *dev)

{

	static char ax25_bcast[AX25_ADDR_LEN] = {

		'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1

	};

	static char ax25_nocall[AX25_ADDR_LEN] = {

		'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1

	};

	const struct hdlcdrv_channel_params dflt_ch_params = { 

		20, 2, 10, 40, 0 

	};
@@ -1182,8 +1176,8 @@ static void baycom_probe(struct net_device *dev) 
	dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;

	dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */

	dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */

	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_nocall, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_nocall, AX25_ADDR_LEN);

	dev->tx_queue_len = 16;



	/* New style flags */

drivers/net/hamradio/bpqether.c

+2 −7
Original line number Diff line number Diff line
@@ -88,11 +88,6 @@ 


static char banner[] __initdata = KERN_INFO "AX.25: bpqether driver version 004\n";



static unsigned char ax25_bcast[AX25_ADDR_LEN] =

	{'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1};

static unsigned char ax25_defaddr[AX25_ADDR_LEN] =

	{'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1};



static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};



static char bpq_eth_addr[6];
@@ -487,8 +482,8 @@ static void bpq_setup(struct net_device *dev) 
	dev->do_ioctl	     = bpq_ioctl;

	dev->destructor	     = free_netdev;



	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr,  ax25_defaddr, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr,  &ax25_defaddr, AX25_ADDR_LEN);



	dev->flags      = 0;

drivers/net/hamradio/dmascc.c

+2 −8
Original line number Diff line number Diff line
@@ -264,12 +264,6 @@ static int io[MAX_NUM_DEVS] __initdata = { 0, }; 


/* Beware! hw[] is also used in cleanup_module(). */

static struct scc_hardware hw[NUM_TYPES] __initdata_or_module = HARDWARE;

static char ax25_broadcast[7] __initdata =

    { 'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1,

'0' << 1 };

static char ax25_test[7] __initdata =

    { 'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1,

'1' << 1 };





/* Global variables */
@@ -443,8 +437,8 @@ static void __init dev_setup(struct net_device *dev) 
	dev->mtu = 1500;

	dev->addr_len = AX25_ADDR_LEN;

	dev->tx_queue_len = 64;

	memcpy(dev->broadcast, ax25_broadcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);

}



static int __init setup_adapter(int card_base, int type, int n)