linux-toradex.git/drivers/net/s2io.c, branch v2.6.32.45

s2io: fixing a ethtool test that is broken

2009-11-14T03:56:53+00:00

Due commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff, it is not more
possible to pci_restore_state() more than once without calling
pci_save_state() in the middle.

Actually running a ethtool test on s2io makes the card inactive,
and it needs to unload/reload the module to fix.

This patch just save the state just after it restore in order to
keep the old behaviour

Signed-off-by: Breno Leitao 
Signed-off-by: David S. Miller

netdev: convert bulk of drivers to netdev_tx_t

2009-09-01T08:14:07+00:00

In a couple of cases collapse some extra code like:
   int retval = NETDEV_TX_OK;
   ...
   return retval;
into
   return NETDEV_TX_OK;

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

s2io: Generate complete messages using single line DBG_PRINTs

2009-08-31T05:35:11+00:00

Single line log messages should be emitted by a single call
where possible.

Converted multiple calls to DBG_PRINT to single call form.
Removed "s2io:" preface from DBG_PRINTs.

The DBG_PRINT macro now emits a log level and is surrounded by
a do {...} while (0)

All s2io log output is now prefaced with KBUILD_MODNAME ": "
via pr_fmt.

The DBG_PRINT macro should probably be converted to use the
dev_ form eventually.

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: Convert skipped nic->config.tx_cfg[i]. to tx_cfg->

2009-08-31T05:35:08+00:00

Missed doing the conversion in earlier patch.

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: Standardize statistics accessors

2009-08-31T05:35:06+00:00

Regularize the declaration and uses of
	struct config_param *config = &sp->config;
	struct mac_info *mac_control = &sp->mac_control;
and use
	struct stat_block *stats = mac_control->stats_info;
	struct swStat *swstats = &stats->sw_stat;
	struct xpakStat *xstats = &stats->xpak_stat;
and convert the longish uses like
	nic->mac_control.stats_info->sw_stat.
to
	swstats->
etc.

This also makes the statistics code marginally smaller
and presumably faster.

Old:
$ size s2io.o
   text	   data	    bss	    dec	    hex	filename
 114289	    516	  33360	 148165	  242c5	s2io.o
New:
$ size s2io.o
   text	   data	    bss	    dec	    hex	filename
 114097	    516	  33360	 147973	  24205	s2io.o

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: fix spelling explaination

2009-08-31T05:35:01+00:00

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: convert printks to pr_

2009-08-31T05:34:55+00:00

Fixed trivial typo as well

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: Make more conforming to normal kernel style

2009-08-31T05:34:51+00:00

Still has a few long lines.

checkpatch was:
	total: 263 errors, 53 warnings, 8751 lines checked
is:
	total: 4 errors, 35 warnings, 8767 lines checked

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: use kzalloc

2009-08-31T05:34:46+00:00

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller

s2io.c: Use calculated size in kmallocs

2009-08-31T05:34:43+00:00

Use consistent style.  Don't calculate the kmalloc size multiple times

Signed-off-by: Joe Perches 
Acked-by: Sreenivasa Honnur 
Signed-off-by: David S. Miller