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

Commit b7a17c0d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of github.com:davem330/net-next

parents 38034518 ce43aa6c

Documentation/networking/batman-adv.txt

+4 −4
Original line number Diff line number Diff line 
[state: 17-04-2011]

[state: 21-08-2011]



BATMAN-ADV

----------
@@ -68,9 +68,9 @@ All mesh wide settings can be found in batman's own interface 
folder:



#  ls  /sys/class/net/bat0/mesh/

#  aggregated_ogms  gw_bandwidth  hop_penalty

# aggregated_ogms   fragmentation gw_sel_class   vis_mode

# ap_isolation      gw_bandwidth  hop_penalty

# bonding           gw_mode       orig_interval

#  fragmentation    gw_sel_class  vis_mode





There is a special folder for debugging information:

drivers/net/ethernet/apple/macmace.c

+1 −8
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ 
#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/gfp.h>

#include <linux/interrupt.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/macintosh.h>

#include <asm/macints.h>

#include <asm/mac_psc.h>

#include <asm/page.h>
@@ -203,14 +202,8 @@ static int __devinit mace_probe(struct platform_device *pdev) 
	unsigned char *addr;

	struct net_device *dev;

	unsigned char checksum = 0;

	static int found = 0;

	int err;



	if (found || macintosh_config->ether_type != MAC_ETHER_MACE)

		return -ENODEV;



	found = 1;	/* prevent 'finding' one on every device probe */



	dev = alloc_etherdev(PRIV_BYTES);

	if (!dev)

		return -ENOMEM;

drivers/net/ethernet/natsemi/macsonic.c

+0 −9
Original line number Diff line number Diff line
@@ -313,22 +313,13 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev) 


static int __devinit mac_onboard_sonic_probe(struct net_device *dev)

{

	/* Bwahahaha */

	static int once_is_more_than_enough;

	struct sonic_local* lp = netdev_priv(dev);

	int sr;

	int commslot = 0;



	if (once_is_more_than_enough)

		return -ENODEV;

	once_is_more_than_enough = 1;



	if (!MACH_IS_MAC)

		return -ENODEV;



	if (macintosh_config->ether_type != MAC_ETHER_SONIC)

		return -ENODEV;



	printk(KERN_INFO "Checking for internal Macintosh ethernet (SONIC).. ");



	/* Bogus probing, on the models which may or may not have

drivers/net/ethernet/smsc/smsc911x.c

+2 −0
Original line number Diff line number Diff line
@@ -2121,6 +2121,8 @@ static int __devinit smsc911x_probe_config_dt( 
	of_property_read_u32(np, "reg-io-width", &width);

	if (width == 4)

		config->flags |= SMSC911X_USE_32BIT;

	else

		config->flags |= SMSC911X_USE_16BIT;



	if (of_get_property(np, "smsc,irq-active-high", NULL))

		config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH;

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#



obj-$(CONFIG_BATMAN_ADV) += batman-adv.o

batman-adv-y += aggregation.o

batman-adv-y += bat_debugfs.o

batman-adv-y += bat_iv_ogm.o

batman-adv-y += bat_sysfs.o

batman-adv-y += bitarray.o

batman-adv-y += gateway_client.o