* Re: Linux 2.6.35/TIPC 2.0 ABI breaking changes
From: Leandro Lucarella @ 2010-10-18 23:38 UTC (permalink / raw)
To: Paul Gortmaker
Cc: jon.maloy, Neil Horman, netdev, linux-kernel, tipc-discussion,
David Miller
In-Reply-To: <4CBCD429.8090306@windriver.com>
Paul Gortmaker, el 18 de octubre a las 19:11 me escribiste:
> On 10-10-18 06:17 PM, David Miller wrote:
> > From: Paul Gortmaker<paul.gortmaker@windriver.com>
> > Date: Mon, 18 Oct 2010 16:42:33 -0400
> >
> >> If you have access to the user space code in question, you can just
> >> switch behaviour semantics based on the results of a uname call, knowing
> >> that this change was included in versions since approx last Feb. There
> >> is also /proc/version which can be parsed manually if you prefer.
> >
> > Requiring userspace to check kernel versioning information in order
> > to user an exported userspace API correctly is _ALWAYS_ _WRONG_.
> >
> > You cannot and must not make backwards incompatible changes to
> > userspace interfaces.
>
> What I think has happened here (and I'll double check this
> tomorrow, since it is before I started assisting with tipc)
> is that a backwards incompatible change *did* inadvertently
> creep in via these two (related) commits:
>
> --------------
> commit d88dca79d3852a3623f606f781e013d61486828a
> Author: Neil Horman <nhorman@tuxdriver.com>
> Date: Mon Mar 8 12:20:58 2010 -0800
>
> tipc: fix endianness on tipc subscriber messages
> --------------
>
> and
>
> ---------------
> commit c6537d6742985da1fbf12ae26cde6a096fd35b5c
> Author: Jon Paul Maloy <jon.maloy@ericsson.com>
> Date: Tue Apr 6 11:40:52 2010 +0000
>
> TIPC: Updated topology subscription protocol according to latest spec
> ---------------
Exactly. The damage is already done, the thing now is how to proceed.
What I'm doing right now is exactly that, use uname(2) to see what
kernel version is running and act according. Act according means, check
how with which tipc.h header the program was compiled (pre or post
2.6.35), compare against the current running kernel version, fix the BO
of subscriptions and fix the filter flags using my own constants
TIPC_SUB_SERVICE_V1 and TIPC_SUB_SERVICE_V2. Is not trivial, is not
nice.
And worse, as I said, for other languages bindings, specially those that
can't directly include a .h, there is no easy solution at all.
> Based on Leandro's info, I think it comes down to userspace
> not knowing exactly where to find these bits anymore:
>
> #define TIPC_SUB_SERVICE 0x00 /* Filter for service availability */
> #define TIPC_SUB_PORTS 0x01 /* Filter for port availability */
> #define TIPC_SUB_CANCEL 0x04 /* Cancel a subscription */
>
> ...because it doesn't know if there is the old auto endian
> swap thing being done or not being done.
There are, at least, 2 problems here. One is the auto endian swap (which
I knew it existed just because of this issue). But the auto endian swap
is not fully backward compatible either AFAIK, at least I tried Gentoo's
kernel 2.6.22 r5 and the topology services doesn't work with NBO (I
don't know if is a bug introduced by Gentoo, or a bug in the kernel or
what else). So just changing the BO and claiming backward compatibility
(even when is only at source code level) is not entirely true (unless is
a Gentoo issue of course, which I should probably check).
The other problem is TIPC_SUB_SERVICE changed it value from 2 to 0. In
TIPC 1.x it was a flag set in the filter member of a subscription. In
TIPC 2.0 is the absence of TIPC_SUB_PORTS. The change seems reasonable,
as TIPC_SUB_SERVICE and TIPC_SUB_PORTS were mutually exclusive and you
had to use one always, but the result is an API and *ABI* change. You
can't use an old TIPC application without changing the code and
recompiling using a tipc.h header from 2.6.35 or newer. And then, if you
need to reboot with an older kernel, the new compiled application won't
work with the old kernel.
A third problem, much less critical but which I find annoying, is that
an inconsistency was introduced. In kernels older than 2.6.35 (TIPC 1.6)
you used HBO for all the TIPC data structures, addresses, port names,
port sequences, port ids, subscriptions, events. Now, subscriptions and
events go in NBO (which contains port sequences and port ids), but when
binding a port name/sequence, you have to use HBO. Is true that
a subscription is supposed to be a network message and the port name you
bind to is not, but is at least inconsistent with AF_INET, where all you
do uses NBO.
> Assuming it is possible to do so in some non-kludgy way,
> it sounds like we want to be looking into an in-kernel change
> that ensures the older user space binaries get their
> functionality restored then?
I think the most reasonable way to do this was to use a different port
name for the topology service for TIPC 2.0, and keep the old TIPC 1.x
topology service at the same port name it was, and using the same
interface as it did. Adding new constants TIPC_TOP_SRV2 and
TIPC_SUB_SERVICE2 (for example) would have been enough to keep backward
compatibility and allow a new clean interface. The old topology service
could be deprecated and completely removed some time in a distant
future. You could even add some #ifdef TIPC_1_COMPATIBILITY to make sure
people using the old interface is aware of that and update to the new
one.
--
Leandro Lucarella (AKA luca) http://llucax.com.ar/
----------------------------------------------------------------------
GPG Key: 5F5A8D05 (F8CD F9A7 BF00 5431 4145 104C 949E BFB6 5F5A 8D05)
----------------------------------------------------------------------
If you do not change your beliefs
Your life will always be like this
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
^ permalink raw reply
* [PATCH] smsc95xx: generate random MAC address once, not every ifup
From: Bernard Blackham @ 2010-10-18 23:16 UTC (permalink / raw)
To: Steve Glendinning, netdev; +Cc: linux-omap
The smsc95xx driver currently generates a new random MAC address
every time the interface is brought up. This makes it impossible to
override using the standard `ifconfig hw ether` approach.
Past patches tried to make the MAC address a module parameter or
base it off the die ID, but it seems to me much simpler (and
hopefully less controversial) to stick with the current random
generation scheme, but allow the user to change the address.
This patch does exactly that - it moves the random address
generation from smsc95xx_reset() into smsc95xx_bind(), so that it is
done once on module load, not on every ifup. The user can then
override this using the standard mechanisms.
Applies against 2.6.35 and linux-2.6 head.
Signed-off-by: Bernard Blackham <b-omap@largestprime.net>
---
--- a/drivers/net/usb/smsc95xx.c 2010-10-19 00:15:35.915612223 +1100
+++ b/drivers/net/usb/smsc95xx.c 2010-10-19 00:15:55.408550929 +1100
@@ -805,8 +805,6 @@ static int smsc95xx_reset(struct usbnet
return ret;
}
- smsc95xx_init_mac_address(dev);
-
ret = smsc95xx_set_mac_address(dev);
if (ret < 0)
return ret;
@@ -1047,6 +1045,8 @@ static int smsc95xx_bind(struct usbnet *
pdata->use_tx_csum = DEFAULT_TX_CSUM_ENABLE;
pdata->use_rx_csum = DEFAULT_RX_CSUM_ENABLE;
+ smsc95xx_init_mac_address(dev);
+
/* Init all registers */
ret = smsc95xx_reset(dev);
^ permalink raw reply
* Re: [PATCH 2/3] cxgb4: function namespace cleanup (v3)
From: Dimitris Michailidis @ 2010-10-18 23:16 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, swise, divy, leedom, netdev
In-Reply-To: <20101018083918.3777a278@nehalam>
Stephen Hemminger wrote:
> Make functions only used in one file local.
> Remove lots of dead code, relating to unsupported functions
> in mainline driver like RSS, IPv6, and TCP offload.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Dimitris Michailidis <dm@chelsio.com>
Thanks much.
^ permalink raw reply
* Re: Linux 2.6.35/TIPC 2.0 ABI breaking changes
From: Paul Gortmaker @ 2010-10-18 23:11 UTC (permalink / raw)
To: David Miller
Cc: luca, jon.maloy, tipc-discussion, linux-kernel, netdev,
Neil Horman
In-Reply-To: <20101018.151708.193712688.davem@davemloft.net>
On 10-10-18 06:17 PM, David Miller wrote:
> From: Paul Gortmaker<paul.gortmaker@windriver.com>
> Date: Mon, 18 Oct 2010 16:42:33 -0400
>
>> If you have access to the user space code in question, you can just
>> switch behaviour semantics based on the results of a uname call, knowing
>> that this change was included in versions since approx last Feb. There
>> is also /proc/version which can be parsed manually if you prefer.
>
> Requiring userspace to check kernel versioning information in order
> to user an exported userspace API correctly is _ALWAYS_ _WRONG_.
>
> You cannot and must not make backwards incompatible changes to
> userspace interfaces.
What I think has happened here (and I'll double check this
tomorrow, since it is before I started assisting with tipc)
is that a backwards incompatible change *did* inadvertently
creep in via these two (related) commits:
--------------
commit d88dca79d3852a3623f606f781e013d61486828a
Author: Neil Horman <nhorman@tuxdriver.com>
Date: Mon Mar 8 12:20:58 2010 -0800
tipc: fix endianness on tipc subscriber messages
--------------
and
---------------
commit c6537d6742985da1fbf12ae26cde6a096fd35b5c
Author: Jon Paul Maloy <jon.maloy@ericsson.com>
Date: Tue Apr 6 11:40:52 2010 +0000
TIPC: Updated topology subscription protocol according to latest spec
---------------
Based on Leandro's info, I think it comes down to userspace
not knowing exactly where to find these bits anymore:
#define TIPC_SUB_SERVICE 0x00 /* Filter for service availability */
#define TIPC_SUB_PORTS 0x01 /* Filter for port availability */
#define TIPC_SUB_CANCEL 0x04 /* Cancel a subscription */
...because it doesn't know if there is the old auto endian
swap thing being done or not being done.
Assuming it is possible to do so in some non-kludgy way,
it sounds like we want to be looking into an in-kernel change
that ensures the older user space binaries get their
functionality restored then?
Thanks,
Paul.
^ permalink raw reply
* Re: [Ksummit-2010-discuss] [v2] Remaining BKL users, what to do
From: Dave Airlie @ 2010-10-18 23:00 UTC (permalink / raw)
To: Greg KH
Cc: Arnd Bergmann, codalist, ksummit-2010-discuss, autofs, Jan Harkes,
Samuel Ortiz, Jan Kara, Arnaldo Carvalho de Melo, netdev,
Anders Larsen, linux-kernel, dri-devel, Bryan Schumaker,
Christoph Hellwig, Petr Vandrovec, Mikulas Patocka, linux-fsdevel,
Evgeniy Dushistov, Ingo Molnar, Andrew Hendry, linux-media
In-Reply-To: <20101018184346.GD27089@kroah.com>
On Tue, Oct 19, 2010 at 4:43 AM, Greg KH <greg@kroah.com> wrote:
> On Mon, Oct 18, 2010 at 05:42:06PM +0200, Arnd Bergmann wrote:
>>
>> Out of the remaining modules, I guess i810/i830, adfs, hpfs and ufs might end
>> up not getting fixed at all, we can either mark them non-SMP or move them
>> to drivers/staging once all the others are done.
>
> I recommend moving them to staging, and then retire them from there if
> no one steps up to maintain them.
I think this sets a bad precedent, these drivers work fine. Removing
BKL from them is hard, and involves finding and booting hw that
developers don't have much time/interest in at the moment. Anyone who
has access to the i810 hw and has time to work out the locking has
more important things to be doing with modern hw, however it doesn't
mean we should just drop support for old drivers because they don't
have active maintainers. Removing the BKL from the kernel is a great
goal, but breaking userspace ABI by removing drivers isn't.
Dave.
^ permalink raw reply
* Re: Bug#595265: linux-image-2.6.32-5-686: Nerwork card fails to come up again after suspend
From: Eric Dumazet @ 2010-10-18 22:50 UTC (permalink / raw)
To: Francois Romieu; +Cc: Ben Hutchings, Arnout Boelens, 595265, netdev
In-Reply-To: <20101018214536.GA14344@electric-eye.fr.zoreil.com>
Le lundi 18 octobre 2010 à 23:45 +0200, Francois Romieu a écrit :
> Ben Hutchings <ben@decadent.org.uk> :
> [...]
> > Arnout Boelens reported that his RTL8111/8168B fails to link-up after
> > suspend and resume, both under Debian's kernel based on 2.6.32 and under
> > 2.6.36-rc6. Full details are at <http://bugs.debian.org/595265>, though
> > the log isn't very informative:
> >
> > [31837.396594] PM: Finishing wakeup.
> > [31837.396597] Restarting tasks ... done.
> > [31840.267267] r8169: eth0: link down
> >
> > Can you suggest how to investigate this further?
>
> Something like the patch made by Stanislaw at :
> https://bugzilla.redhat.com/show_bug.cgi?id=502974
>
Seems to be down at this moment, patch is also here (and included in
2.6.36-rc8 ) :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=aeb19f6052b5e5c8a24aa444fbff73b84341beac
^ permalink raw reply
* Re: [PATCH] secmark: do not return early if there was no error
From: James Morris @ 2010-10-18 22:48 UTC (permalink / raw)
To: Patrick McHardy
Cc: Eric Paris, netfilter-devel, netfilter, coreteam, netdev, davem,
jengelh, paul.moore
In-Reply-To: <4CB86E6A.1040807@trash.net>
On Fri, 15 Oct 2010, Patrick McHardy wrote:
> > ...
> > RIP [<ffffffffa022117d>] secmark_tg+0x17/0x2e [xt_SECMARK]
> > RSP <ffff880003e03a40>
> > ---[ end trace 9aa5d06a71143e74 ]---
> >
> > Signed-off-by: Eric Paris <eparis@redhat.com>
> > Acked-by: Paul Moore <paul.moore@hp.com>
> > Acked-by: James Morris <jmorris@namei.org>
>
> Acked-by: Patrick McHardy <kaber@trash.net>
>
> I'll leave it up to Dave whether this can still go into 2.6.36.
FYI, I have a copy now in my #next branch, as it's a pre-requisite for
further patches.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* Re: Bug#595265: linux-image-2.6.32-5-686: Nerwork card fails to come up again after suspend
From: Ben Hutchings @ 2010-10-18 22:48 UTC (permalink / raw)
To: Arnout Boelens, Francois Romieu; +Cc: 595265, netdev
In-Reply-To: <20101018214536.GA14344@electric-eye.fr.zoreil.com>
[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]
On Mon, 2010-10-18 at 23:45 +0200, Francois Romieu wrote:
> Ben Hutchings <ben@decadent.org.uk> :
> [...]
> > Arnout Boelens reported that his RTL8111/8168B fails to link-up after
> > suspend and resume, both under Debian's kernel based on 2.6.32 and under
> > 2.6.36-rc6. Full details are at <http://bugs.debian.org/595265>, though
> > the log isn't very informative:
> >
> > [31837.396594] PM: Finishing wakeup.
> > [31837.396597] Restarting tasks ... done.
> > [31840.267267] r8169: eth0: link down
> >
> > Can you suggest how to investigate this further?
>
> Something like the patch made by Stanislaw at :
> https://bugzilla.redhat.com/show_bug.cgi?id=502974
Thanks.
Arnout, please test the patch
<https://bugzilla.redhat.com/attachment.cgi?id=454034>, following the
instructions at
<http://kernel-handbook.alioth.debian.org/ch-common-tasks.html#s-common-official>.
Ben.
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* [patch 1/1] phy/marvell: fix 88e1121 support
From: Arnaud Patard @ 2010-10-18 22:29 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Cyril Chemparathy, Arnaud Patard
In-Reply-To: <20101018222947.418028323@rtp-net.org>
[-- Attachment #1: phy_marvell_fix_modes.patch --]
[-- Type: text/plain, Size: 2052 bytes --]
Commit c477d0447db08068a497e7beb892b2b2a7bff64b added support for RGMII
rx/tx delays except that it ends up clearing rx/tx delays bit for modes
differents that RGMII*ID. Due to this, ethernet is not working anymore
on my guruplug server +. This patch is fixing that.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Index: linux-2.6/drivers/net/phy/marvell.c
===================================================================
--- linux-2.6.orig/drivers/net/phy/marvell.c 2010-10-18 22:46:09.000000000 +0200
+++ linux-2.6/drivers/net/phy/marvell.c 2010-10-19 00:20:22.000000000 +0200
@@ -196,20 +196,27 @@
MII_88E1121_PHY_MSCR_PAGE);
if (err < 0)
return err;
- mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
- MII_88E1121_PHY_MSCR_DELAY_MASK;
- if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
- mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
- MII_88E1121_PHY_MSCR_TX_DELAY);
- else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
- mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
- else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
- mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
+ if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
+ (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+ (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+ (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
- err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
- if (err < 0)
- return err;
+ mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
+ MII_88E1121_PHY_MSCR_DELAY_MASK;
+
+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+ mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
+ MII_88E1121_PHY_MSCR_TX_DELAY);
+ else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+ mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
+ else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+ mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
+
+ err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
+ if (err < 0)
+ return err;
+ }
phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
^ permalink raw reply
* [patch 0/1] Re: [patch 1/1] phy/marvell: fix 88e1121 support
From: Arnaud Patard @ 2010-10-18 22:29 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Cyril Chemparathy
In-Reply-To: <4CBCC3FC.2030506@ti.com>
>> @@ -199,13 +199,13 @@
>> mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
>> MII_88E1121_PHY_MSCR_DELAY_MASK;
>>
>> - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
>> - mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
>> - MII_88E1121_PHY_MSCR_TX_DELAY);
>> - else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
>> + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
>> mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
>> else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
>> mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
>> + else
>> + mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
>> + MII_88E1121_PHY_MSCR_TX_DELAY);
>>
>> err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
>> if (err < 0)
>
> This doesn't look right. This change makes it impossible to configure
> the phy without interface delays, i.e., PHY_INTERFACE_MODE_RGMII ends up
> behaving the same as PHY_INTERFACE_MODE_RGMII_ID.
>
ok. The other possibility is to modify the MII_88E1121_PHY_MSCR_REG regs
only in RGMII_* case like for the 88e1111 case imho.
I'm sending a patch doing that right now.
Regards,
Arnaud
^ permalink raw reply
* Re: Linux 2.6.35/TIPC 2.0 ABI breaking changes
From: David Miller @ 2010-10-18 22:17 UTC (permalink / raw)
To: paul.gortmaker; +Cc: luca, jon.maloy, tipc-discussion, linux-kernel, netdev
In-Reply-To: <AANLkTimKbOreV4Fuyw3TbCrk9aa5yBZQSuRbo3Vdx=Q1@mail.gmail.com>
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 18 Oct 2010 16:42:33 -0400
> If you have access to the user space code in question, you can just
> switch behaviour semantics based on the results of a uname call, knowing
> that this change was included in versions since approx last Feb. There
> is also /proc/version which can be parsed manually if you prefer.
Requiring userspace to check kernel versioning information in order
to user an exported userspace API correctly is _ALWAYS_ _WRONG_.
You cannot and must not make backwards incompatible changes to
userspace interfaces.
Really, you can't.
^ permalink raw reply
* [PATCH] pktgen: clean up handling of local/transient counter vars
From: Paul Gortmaker @ 2010-10-18 22:14 UTC (permalink / raw)
To: davem; +Cc: netdev
The temporary variable "i" is needlessly initialized to zero
in two distinct cases in this file:
1) where it is set to zero and then used as an argument in an addition
before being assigned a non-zero value.
2) where it is only used in a standard/typical loop counter
For (1), simply delete assignment to zero and usages while still
zero; for (2) simply make the loop start at zero as per standard
practice as seen everywhere else in the same file.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
net/core/pktgen.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 2c0df0f..679b797 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -771,10 +771,10 @@ done:
static unsigned long num_arg(const char __user * user_buffer,
unsigned long maxlen, unsigned long *num)
{
- int i = 0;
+ int i;
*num = 0;
- for (; i < maxlen; i++) {
+ for (i = 0; i < maxlen; i++) {
char c;
if (get_user(c, &user_buffer[i]))
return -EFAULT;
@@ -789,9 +789,9 @@ static unsigned long num_arg(const char __user * user_buffer,
static int strn_len(const char __user * user_buffer, unsigned int maxlen)
{
- int i = 0;
+ int i;
- for (; i < maxlen; i++) {
+ for (i = 0; i < maxlen; i++) {
char c;
if (get_user(c, &user_buffer[i]))
return -EFAULT;
@@ -846,7 +846,7 @@ static ssize_t pktgen_if_write(struct file *file,
{
struct seq_file *seq = file->private_data;
struct pktgen_dev *pkt_dev = seq->private;
- int i = 0, max, len;
+ int i, max, len;
char name[16], valstr[32];
unsigned long value = 0;
char *pg_result = NULL;
@@ -860,13 +860,13 @@ static ssize_t pktgen_if_write(struct file *file,
return -EINVAL;
}
- max = count - i;
- tmp = count_trail_chars(&user_buffer[i], max);
+ max = count;
+ tmp = count_trail_chars(user_buffer, max);
if (tmp < 0) {
pr_warning("illegal format\n");
return tmp;
}
- i += tmp;
+ i = tmp;
/* Read variable name */
@@ -1764,7 +1764,7 @@ static ssize_t pktgen_thread_write(struct file *file,
{
struct seq_file *seq = file->private_data;
struct pktgen_thread *t = seq->private;
- int i = 0, max, len, ret;
+ int i, max, len, ret;
char name[40];
char *pg_result;
@@ -1773,12 +1773,12 @@ static ssize_t pktgen_thread_write(struct file *file,
return -EINVAL;
}
- max = count - i;
- len = count_trail_chars(&user_buffer[i], max);
+ max = count;
+ len = count_trail_chars(user_buffer, max);
if (len < 0)
return len;
- i += len;
+ i = len;
/* Read variable name */
@@ -1975,7 +1975,7 @@ static struct net_device *pktgen_dev_get_by_name(struct pktgen_dev *pkt_dev,
const char *ifname)
{
char b[IFNAMSIZ+5];
- int i = 0;
+ int i;
for (i = 0; ifname[i] != '@'; i++) {
if (i == IFNAMSIZ)
@@ -2519,8 +2519,8 @@ static void free_SAs(struct pktgen_dev *pkt_dev)
{
if (pkt_dev->cflows) {
/* let go of the SAs if we have them */
- int i = 0;
- for (; i < pkt_dev->cflows; i++) {
+ int i;
+ for (i = 0; i < pkt_dev->cflows; i++) {
struct xfrm_state *x = pkt_dev->flows[i].x;
if (x) {
xfrm_state_put(x);
--
1.7.2.1
^ permalink raw reply related
* Re: [patch 1/1] phy/marvell: fix 88e1121 support
From: Cyril Chemparathy @ 2010-10-18 22:02 UTC (permalink / raw)
To: Arnaud Patard; +Cc: netdev@vger.kernel.org, David S. Miller
In-Reply-To: <20101018214414.375368957@rtp-net.org>
Hi,
On 10/18/2010 05:44 PM, Arnaud Patard wrote:
> Commit c477d0447db08068a497e7beb892b2b2a7bff64b added support for RGMII
> rx/tx delays except that it ends up clearing rx/tx delays bit for modes
> differents that RGMII*ID. Due to this, ethernet is not working anymore
> on my guruplug server +. This patch is fixing that.
>
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> Index: linux-2.6/drivers/net/phy/marvell.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/phy/marvell.c 2010-10-18 22:46:09.000000000 +0200
> +++ linux-2.6/drivers/net/phy/marvell.c 2010-10-18 23:19:14.000000000 +0200
> @@ -199,13 +199,13 @@
> mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
> MII_88E1121_PHY_MSCR_DELAY_MASK;
>
> - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
> - mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
> - MII_88E1121_PHY_MSCR_TX_DELAY);
> - else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
> + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
> mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
> else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
> mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
> + else
> + mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
> + MII_88E1121_PHY_MSCR_TX_DELAY);
>
> err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
> if (err < 0)
This doesn't look right. This change makes it impossible to configure
the phy without interface delays, i.e., PHY_INTERFACE_MODE_RGMII ends up
behaving the same as PHY_INTERFACE_MODE_RGMII_ID.
I think the correct fix would be to modify guruplug's interface mode to
PHY_INTERFACE_MODE_RGMII_ID if both TX and RX side delays are desired.
Regards
Cyril.
^ permalink raw reply
* Re: Bug#595265: linux-image-2.6.32-5-686: Nerwork card fails to come up again after suspend
From: Francois Romieu @ 2010-10-18 21:45 UTC (permalink / raw)
To: Ben Hutchings; +Cc: Arnout Boelens, 595265, netdev
In-Reply-To: <1287361431.20865.133.camel@localhost>
Ben Hutchings <ben@decadent.org.uk> :
[...]
> Arnout Boelens reported that his RTL8111/8168B fails to link-up after
> suspend and resume, both under Debian's kernel based on 2.6.32 and under
> 2.6.36-rc6. Full details are at <http://bugs.debian.org/595265>, though
> the log isn't very informative:
>
> [31837.396594] PM: Finishing wakeup.
> [31837.396597] Restarting tasks ... done.
> [31840.267267] r8169: eth0: link down
>
> Can you suggest how to investigate this further?
Something like the patch made by Stanislaw at :
https://bugzilla.redhat.com/show_bug.cgi?id=502974
--
Ueimor
^ permalink raw reply
* Re: [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1
From: Tom Herbert @ 2010-10-18 21:46 UTC (permalink / raw)
To: Ben Hutchings; +Cc: davem, netdev, eric.dumazet
In-Reply-To: <1287437621.2252.766.camel@achroite.uk.solarflarecom.com>
> Off by one?
>
Yes, thanks for catching that.
> Ben.
>
>> + return NULL;
>> + }
>> +
>> alloc_size = sizeof(struct net_device);
>> if (sizeof_priv) {
>> /* ensure 32-byte alignment of private area */
>
> --
> Ben Hutchings, Senior Software Engineer, Solarflare Communications
> Not speaking for my employer; that's the marketing department's job.
> They asked us to note that Solarflare product names are trademarked.
>
>
^ permalink raw reply
* [patch 1/1] phy/marvell: fix 88e1121 support
From: Arnaud Patard @ 2010-10-18 21:44 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Cyril Chemparathy
In-Reply-To: <20101018214401.053486146@rtp-net.org>
[-- Attachment #1: phy_marvell_fix_modes.patch --]
[-- Type: text/plain, Size: 1278 bytes --]
Commit c477d0447db08068a497e7beb892b2b2a7bff64b added support for RGMII
rx/tx delays except that it ends up clearing rx/tx delays bit for modes
differents that RGMII*ID. Due to this, ethernet is not working anymore
on my guruplug server +. This patch is fixing that.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Index: linux-2.6/drivers/net/phy/marvell.c
===================================================================
--- linux-2.6.orig/drivers/net/phy/marvell.c 2010-10-18 22:46:09.000000000 +0200
+++ linux-2.6/drivers/net/phy/marvell.c 2010-10-18 23:19:14.000000000 +0200
@@ -199,13 +199,13 @@
mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
MII_88E1121_PHY_MSCR_DELAY_MASK;
- if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
- mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
- MII_88E1121_PHY_MSCR_TX_DELAY);
- else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
+ else
+ mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
+ MII_88E1121_PHY_MSCR_TX_DELAY);
err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
if (err < 0)
^ permalink raw reply
* Re: [PATCH net-next 3/5] tipc: Optimizations to bearer enabling logic
From: Paul Gortmaker @ 2010-10-18 21:43 UTC (permalink / raw)
To: Neil Horman; +Cc: davem, netdev, allan.stephens
In-Reply-To: <20101018105017.GA16326@hmsreliant.think-freely.org>
[Re: [PATCH net-next 3/5] tipc: Optimizations to bearer enabling logic] On 18/10/2010 (Mon 06:50) Neil Horman wrote:
> On Fri, Oct 15, 2010 at 05:31:16PM -0400, Paul Gortmaker wrote:
> > On 10-10-15 07:00 AM, Neil Horman wrote:
> >
> > [...]
> >
> > > This definately looks more concise, but I don't see why its necessecary to drop
> > > the tipc_net_lock around the call to enable_bearer. The only caler of
> > > tipc_register_media sets the enable_bearer pointer to the enable_bearer
> > > function, and I' don't see any path through that function which would
> > > potentially retake that lock. In fact it seems dropping it might be dangerous,
> > > if other paths (like from cfg_named_msg_event), tried to enable a bearer in
> > > parallel with a user space directive from the netlink socket). With out the
> > > protection of tipc_net_lock, you could use the same eth_bearer twice, and
> > > corrupt that array.
> >
> > I think it would be protected by config_lock. but in the end if it is
> > just an academic optimization that really isn't in a hot code path
> > anyway, and if it just adds more confusion than real world value, then
> > I'm fine with just dropping this on the floor (and deleting the extra
> > memset in a cleanup patch) -- it won't be the 1st time doing this with
> > these carry forward patches, and I'm sure it won't be the last.
> >
>
> Copy that.
And here is all that is left once I drop all the above. Not much. :)
Thanks again,
Paul.
>From 35b078621c4ca6e6f5a5aed80c34594e00f08c8e Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 14 Oct 2010 16:09:23 -0400
Subject: [PATCH] tipc: delete needless memset from bearer enabling.
Eliminates zeroing out of the new bearer structure at the start of
activation, since it is already in that state.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
net/tipc/bearer.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index fd9c06c..9927d1d 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -556,8 +556,6 @@ restart:
}
b_ptr = &tipc_bearers[bearer_id];
- memset(b_ptr, 0, sizeof(struct bearer));
-
strcpy(b_ptr->publ.name, name);
res = m_ptr->enable_bearer(&b_ptr->publ);
if (res) {
--
1.7.2.1
^ permalink raw reply related
* Re: [PATCH 3/3] net: allocate tx queues in register_netdevice
From: Ben Hutchings @ 2010-10-18 21:41 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev, eric.dumazet, John Fastabend
In-Reply-To: <alpine.DEB.1.00.1010181057580.16304@pokey.mtv.corp.google.com>
On Mon, 2010-10-18 at 11:02 -0700, Tom Herbert wrote:
> This patch introduces netif_alloc_netdev_queues which is called from
> register_device instead of alloc_netdev_mq. This makes TX queue
> allocation symmetric with RX allocation similarly allows drivers to
> change dev->num_tx_queues after allocating netdev and before
> registering it.
Changing num_tx_queues is probably *not* desirable, same as for
num_rx_queues.
[...]
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -1553,18 +1553,24 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
> * Routine to help set real_num_tx_queues. To avoid skbs mapped to queues
> * greater then real_num_tx_queues stale skbs on the qdisc must be flushed.
> */
> -void netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
> +int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
> {
> - unsigned int real_num = dev->real_num_tx_queues;
> + if (txq < 1)
> + return -EINVAL;
>
> - if (unlikely(txq > dev->num_tx_queues))
> - ;
> - else if (txq > real_num)
> - dev->real_num_tx_queues = txq;
> - else if (txq < real_num) {
> - dev->real_num_tx_queues = txq;
> - qdisc_reset_all_tx_gt(dev, txq);
> - }
> + if (dev->reg_state == NETREG_REGISTERED) {
> + ASSERT_RTNL();
> +
> + if (txq > dev->num_tx_queues)
> + return -EINVAL;
> +
> + if (txq < dev->real_num_tx_queues)
> + qdisc_reset_all_tx_gt(dev, txq);
> + } else
> + dev->num_tx_queues = txq;
[...]
The kernel-doc comment should be updated to reflect the locking
requirement and the possibility of failure when called after
registration.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH 2/3] net: cleanups in RX queue allocation
From: Ben Hutchings @ 2010-10-18 21:37 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev, eric.dumazet, John Fastabend
In-Reply-To: <alpine.DEB.1.00.1010181056590.16238@pokey.mtv.corp.google.com>
On Mon, 2010-10-18 at 11:02 -0700, Tom Herbert wrote:
> Clean up in RX queue allocation. In netif_set_real_num_rx_queues
> return error on attempt to set zero queues, and set
> dev->num_rx_queues if device not registered (similar to TX
> allocation).
[...]
John Fastabend just removed this assignment as it is apparently
undesirable for ixgbe.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH 1/3] net: fail alloc_netdev_mq if queue count < 1
From: Ben Hutchings @ 2010-10-18 21:33 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev, eric.dumazet
In-Reply-To: <alpine.DEB.1.00.1010181055300.16090@pokey.mtv.corp.google.com>
On Mon, 2010-10-18 at 11:02 -0700, Tom Herbert wrote:
> In alloc_netdev_mq fail if requested queue_count < 1.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> net/core/dev.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 04972a4..76db105 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -5511,6 +5511,12 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
>
> BUG_ON(strlen(name) >= sizeof(dev->name));
>
> + if (queue_count < 0) {
> + printk(KERN_ERR "alloc_netdev: Unable to allocate device "
> + "with zero queues.\n");
Off by one?
Ben.
> + return NULL;
> + }
> +
> alloc_size = sizeof(struct net_device);
> if (sizeof_priv) {
> /* ensure 32-byte alignment of private area */
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: Linux 2.6.35/TIPC 2.0 ABI breaking changes [was: TIPC 2.0 and TIPC_SUB_SERVICE]
From: Paul Gortmaker @ 2010-10-18 20:42 UTC (permalink / raw)
To: Leandro Lucarella
Cc: Jon Maloy, davem, tipc-discussion@lists.sourceforge.net,
linux-kernel, netdev
In-Reply-To: <20101018184628.GX8781@llucax.com.ar>
On Mon, Oct 18, 2010 at 2:46 PM, Leandro Lucarella <luca@llucax.com.ar> wrote:
> Leandro Lucarella, el 18 de octubre a las 12:04 me escribiste:
>> This means D can't be used to write code that uses TIPC if you target
>> kernels >= 2.6.35 (unless they write their own bindings, or at least use
>> a custom TIPC_SUB_SERVICE constant). I could change the TIPC_SUB_SERVICE
>> value, but then people using older kernels will be screwed. Another
>> option is to use the version statement (kind of like C's #ifdef):
>>
>> version (TIPC_2_0)
>> const TIPC_SUB_SERVICE = 0x00;
>> else
>> const TIPC_SUB_SERVICE = 0x02;
>
> I keep finding problems with this change. Another, no D-related, problem
> with this change is old code could be silently (and very subtly) broken
> if they check for TIPC_SUB_SERVICE as a flag with something like:
>
> if (s.filter & TIPC_SUB_SERVICE)
> /* do something */
>
> Because TIPC_SUB_SERVICE has changed its semantics, not just its value,
> and the new value (0x00) will give you always 0 in that test. This one
> is really tricky, because the application code will fail silently, there
> will be no dmesg indication of a failure, nor the connection to the
> topology service be closed. You might get a compiler warning if you're
> lucky.
If you have access to the user space code in question, you can just
switch behaviour semantics based on the results of a uname call, knowing
that this change was included in versions since approx last Feb. There
is also /proc/version which can be parsed manually if you prefer.
If you have kernel code/modules, you can do the same/similar things with
the KERNEL_VERSION and its support macros.
In either case, you don't have to restrict yourself to information that is
specific to and/or exported just from TIPC itself.
Hope that helps,
Paul.
>
> --
> Leandro Lucarella (AKA luca) http://llucax.com.ar/
> ----------------------------------------------------------------------
> GPG Key: 5F5A8D05 (F8CD F9A7 BF00 5431 4145 104C 949E BFB6 5F5A 8D05)
> ----------------------------------------------------------------------
> Novocaine for the soul
> you better give me something
> to fill the hole
> before I sputter out
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* GET BACK FRIEND
From: info lawfirm @ 2010-10-18 10:11 UTC (permalink / raw)
To: info
Friend i need you
for a claim of inheritace
get back for more information
^ permalink raw reply
* Re: 2.6.36-rc7: net/bridge causes temporary network I/O lockups [2]
From: Patrick Ringl @ 2010-10-18 20:37 UTC (permalink / raw)
To: Herbert Xu; +Cc: Patrick Ringl, netdev, linux-kernel, bridge
In-Reply-To: <20101018161656.GA2403@gondor.apana.org.au>
[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]
On 10/18/2010 06:16 PM, Herbert Xu wrote:
> On Sat, Oct 16, 2010 at 08:15:31PM +0200, Patrick Ringl wrote:
>
>> Hi,
>>
>> okay I narrowed down the issue. I watched all function calls of the
>> 'bridge' module with the help of a small systemtap probe of mine. I
>> first traced a timespan where the issue did not occur, then one where it
>> did and composed an intersection of these two:
>>
> I can't reproduce this problem here so I'll need your help to
> track it down.
>
> Can you see if you can relate the lock-ups to specific events
> such as a particular packet being sent through the bridge?
>
The problem is definitely somewhere in the 2.6.34 commit regarding IGMP
snooping (when disabling it, everything works). I have attached a
tcpdump log of data coming through the bridge and data coming through an
attached port (eth1). The lockups are easily spotted, since I use mtr to
constantly ping the problematic machine, and there aren't any
incoming/outgoing packets during the lockup.
> If we can recreate the problem on demand that that helps us to
> find the root cause.
>
> You mentioned that you took packet dumps on the system. If you
> can show us the packets through the bridge and its ports when
> the problem occurs that would be great.
>
> Thanks,
>
Anything else I could possibly provide? :-)
regards,
Patrick
[-- Attachment #2: dump_br0 --]
[-- Type: application/octet-stream, Size: 2764 bytes --]
[-- Attachment #3: dump_eth1 --]
[-- Type: application/octet-stream, Size: 2806 bytes --]
^ permalink raw reply
* Re: [PATCH net-next] vxge: make functions local and remove dead code
From: Jon Mason @ 2010-10-18 20:28 UTC (permalink / raw)
To: Stephen Hemminger
Cc: David Miller, netdev@vger.kernel.org, Ramkrishna Vepa,
Sivakumar Subramani, Sreenivasa Honnur
In-Reply-To: <20101015102110.056690c6@nehalam>
On Fri, Oct 15, 2010 at 10:21:10AM -0700, Stephen Hemminger wrote:
> Use results of make namespacecheck to make functions local and
> remove code that is not used.
>
> Also rename initialize_ethtool_ops to vxge_initialize_ethtool_ops.
>
> Compile tested only.
These all look sane. I have a patchset coming out soon that has some
of these changes, and I was going to make the rest of the changes
below in the following series (per your earlier e-mail). I would
prefer to release those before applying this patch, as it touches many
things.
Thanks,
Jon
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>
> ---
> drivers/net/vxge/vxge-config.c | 332 +++++++++++++++++++++++++++++-----------
> drivers/net/vxge/vxge-config.h | 227 ---------------------------
> drivers/net/vxge/vxge-ethtool.c | 2
> drivers/net/vxge/vxge-main.c | 64 ++++---
> drivers/net/vxge/vxge-main.h | 59 -------
> drivers/net/vxge/vxge-traffic.c | 101 +-----------
> drivers/net/vxge/vxge-traffic.h | 134 ----------------
> 7 files changed, 304 insertions(+), 615 deletions(-)
>
> --- a/drivers/net/vxge/vxge-config.c 2010-10-15 09:10:06.686399147 -0700
> +++ b/drivers/net/vxge/vxge-config.c 2010-10-15 10:15:51.420682586 -0700
> @@ -20,6 +20,179 @@
> #include "vxge-traffic.h"
> #include "vxge-config.h"
>
> +static enum vxge_hw_status
> +__vxge_hw_fifo_create(
> + struct __vxge_hw_vpath_handle *vpath_handle,
> + struct vxge_hw_fifo_attr *attr);
> +
> +static enum vxge_hw_status
> +__vxge_hw_fifo_abort(
> + struct __vxge_hw_fifo *fifoh);
> +
> +static enum vxge_hw_status
> +__vxge_hw_fifo_reset(
> + struct __vxge_hw_fifo *ringh);
> +
> +static enum vxge_hw_status
> +__vxge_hw_fifo_delete(
> + struct __vxge_hw_vpath_handle *vpath_handle);
> +
> +static struct __vxge_hw_blockpool_entry *
> +__vxge_hw_blockpool_block_allocate(struct __vxge_hw_device *hldev,
> + u32 size);
> +
> +static void
> +__vxge_hw_blockpool_block_free(struct __vxge_hw_device *hldev,
> + struct __vxge_hw_blockpool_entry *entry);
> +
> +static void vxge_hw_blockpool_block_add(struct __vxge_hw_device *devh,
> + void *block_addr,
> + u32 length,
> + struct pci_dev *dma_h,
> + struct pci_dev *acc_handle);
> +
> +static enum vxge_hw_status
> +__vxge_hw_blockpool_create(struct __vxge_hw_device *hldev,
> + struct __vxge_hw_blockpool *blockpool,
> + u32 pool_size,
> + u32 pool_max);
> +
> +static void
> +__vxge_hw_blockpool_destroy(struct __vxge_hw_blockpool *blockpool);
> +
> +static void *
> +__vxge_hw_blockpool_malloc(struct __vxge_hw_device *hldev,
> + u32 size,
> + struct vxge_hw_mempool_dma *dma_object);
> +
> +static void
> +__vxge_hw_blockpool_free(struct __vxge_hw_device *hldev,
> + void *memblock,
> + u32 size,
> + struct vxge_hw_mempool_dma *dma_object);
> +
> +
> +static struct __vxge_hw_channel*
> +__vxge_hw_channel_allocate(struct __vxge_hw_vpath_handle *vph,
> + enum __vxge_hw_channel_type type, u32 length,
> + u32 per_dtr_space, void *userdata);
> +
> +static void
> +__vxge_hw_channel_free(
> + struct __vxge_hw_channel *channel);
> +
> +static enum vxge_hw_status
> +__vxge_hw_channel_initialize(
> + struct __vxge_hw_channel *channel);
> +
> +static enum vxge_hw_status
> +__vxge_hw_channel_reset(
> + struct __vxge_hw_channel *channel);
> +
> +static enum vxge_hw_status __vxge_hw_ring_delete(struct __vxge_hw_vpath_handle *vp);
> +
> +static enum vxge_hw_status
> +__vxge_hw_device_fifo_config_check(struct vxge_hw_fifo_config *fifo_config);
> +
> +static enum vxge_hw_status
> +__vxge_hw_device_config_check(struct vxge_hw_device_config *new_config);
> +
> +static void
> +__vxge_hw_device_id_get(struct __vxge_hw_device *hldev);
> +
> +static void
> +__vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_card_info_get(
> + u32 vp_id,
> + struct vxge_hw_vpath_reg __iomem *vpath_reg,
> + struct vxge_hw_device_hw_info *hw_info);
> +
> +static enum vxge_hw_status
> +__vxge_hw_device_initialize(struct __vxge_hw_device *hldev);
> +
> +static void
> +__vxge_hw_device_pci_e_init(struct __vxge_hw_device *hldev);
> +
> +static enum vxge_hw_status
> +__vxge_hw_device_reg_addr_get(struct __vxge_hw_device *hldev);
> +
> +static enum vxge_hw_status
> +__vxge_hw_device_register_poll(
> + void __iomem *reg,
> + u64 mask, u32 max_millis);
> +
> +static inline enum vxge_hw_status
> +__vxge_hw_pio_mem_write64(u64 val64, void __iomem *addr,
> + u64 mask, u32 max_millis)
> +{
> + __vxge_hw_pio_mem_write32_lower((u32)vxge_bVALn(val64, 32, 32), addr);
> + wmb();
> +
> + __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32), addr);
> + wmb();
> +
> + return __vxge_hw_device_register_poll(addr, mask, max_millis);
> +}
> +
> +static struct vxge_hw_mempool*
> +__vxge_hw_mempool_create(struct __vxge_hw_device *devh, u32 memblock_size,
> + u32 item_size, u32 private_size, u32 items_initial,
> + u32 items_max, struct vxge_hw_mempool_cbs *mp_callback,
> + void *userdata);
> +static void __vxge_hw_mempool_destroy(struct vxge_hw_mempool *mempool);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_stats_get(struct __vxge_hw_virtualpath *vpath,
> + struct vxge_hw_vpath_stats_hw_info *hw_stats);
> +
> +static enum vxge_hw_status
> +vxge_hw_vpath_stats_enable(struct __vxge_hw_vpath_handle *vpath_handle);
> +
> +static enum vxge_hw_status
> +__vxge_hw_legacy_swapper_set(struct vxge_hw_legacy_reg __iomem *legacy_reg);
> +
> +static u64
> +__vxge_hw_vpath_pci_func_mode_get(u32 vp_id,
> + struct vxge_hw_vpath_reg __iomem *vpath_reg);
> +
> +static u32
> +__vxge_hw_vpath_func_id_get(u32 vp_id, struct vxge_hw_vpmgmt_reg __iomem *vpmgmt_reg);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_addr_get(u32 vp_id, struct vxge_hw_vpath_reg __iomem *vpath_reg,
> + u8 (macaddr)[ETH_ALEN], u8 (macaddr_mask)[ETH_ALEN]);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_reset_check(struct __vxge_hw_virtualpath *vpath);
> +
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_sw_reset(struct __vxge_hw_device *devh, u32 vp_id);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_fw_ver_get(u32 vp_id, struct vxge_hw_vpath_reg __iomem *vpath_reg,
> + struct vxge_hw_device_hw_info *hw_info);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_mac_configure(struct __vxge_hw_device *devh, u32 vp_id);
> +
> +static void
> +__vxge_hw_vp_terminate(struct __vxge_hw_device *devh, u32 vp_id);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_stats_access(struct __vxge_hw_virtualpath *vpath,
> + u32 operation, u32 offset, u64 *stat);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_xmac_tx_stats_get(struct __vxge_hw_virtualpath *vpath,
> + struct vxge_hw_xmac_vpath_tx_stats *vpath_tx_stats);
> +
> +static enum vxge_hw_status
> +__vxge_hw_vpath_xmac_rx_stats_get(struct __vxge_hw_virtualpath *vpath,
> + struct vxge_hw_xmac_vpath_rx_stats *vpath_rx_stats);
> +
> /*
> * __vxge_hw_channel_allocate - Allocate memory for channel
> * This function allocates required memory for the channel and various arrays
> @@ -190,7 +363,7 @@ __vxge_hw_device_pci_e_init(struct __vxg
> * Will poll certain register for specified amount of time.
> * Will poll until masked bit is not cleared.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_device_register_poll(void __iomem *reg, u64 mask, u32 max_millis)
> {
> u64 val64;
> @@ -221,7 +394,7 @@ __vxge_hw_device_register_poll(void __io
> * in progress
> * This routine checks the vpath reset in progress register is turned zero
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_device_vpath_reset_in_prog_check(u64 __iomem *vpath_rst_in_prog)
> {
> enum vxge_hw_status status;
> @@ -236,7 +409,7 @@ __vxge_hw_device_vpath_reset_in_prog_che
> * This routine sets the swapper and reads the toc pointer and returns the
> * memory mapped address of the toc
> */
> -struct vxge_hw_toc_reg __iomem *
> +static struct vxge_hw_toc_reg __iomem *
> __vxge_hw_device_toc_get(void __iomem *bar0)
> {
> u64 val64;
> @@ -779,7 +952,7 @@ exit:
> * vxge_hw_device_xmac_aggr_stats_get - Get the Statistics on aggregate port
> * Get the Statistics on aggregate port
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> vxge_hw_device_xmac_aggr_stats_get(struct __vxge_hw_device *hldev, u32 port,
> struct vxge_hw_xmac_aggr_stats *aggr_stats)
> {
> @@ -814,7 +987,7 @@ exit:
> * vxge_hw_device_xmac_port_stats_get - Get the Statistics on a port
> * Get the Statistics on port
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> vxge_hw_device_xmac_port_stats_get(struct __vxge_hw_device *hldev, u32 port,
> struct vxge_hw_xmac_port_stats *port_stats)
> {
> @@ -952,20 +1125,6 @@ u32 vxge_hw_device_trace_level_get(struc
> return 0;
> #endif
> }
> -/*
> - * vxge_hw_device_debug_mask_get - Get the debug mask
> - * This routine returns the current debug mask set
> - */
> -u32 vxge_hw_device_debug_mask_get(struct __vxge_hw_device *hldev)
> -{
> -#if defined(VXGE_DEBUG_TRACE_MASK) || defined(VXGE_DEBUG_ERR_MASK)
> - if (hldev == NULL)
> - return 0;
> - return hldev->debug_module_mask;
> -#else
> - return 0;
> -#endif
> -}
>
> /*
> * vxge_hw_getpause_data -Pause frame frame generation and reception.
> @@ -1090,7 +1249,7 @@ __vxge_hw_ring_block_next_pointer_set(u8
> * first block
> * Returns the dma address of the first RxD block
> */
> -u64 __vxge_hw_ring_first_block_address_get(struct __vxge_hw_ring *ring)
> +static u64 __vxge_hw_ring_first_block_address_get(struct __vxge_hw_ring *ring)
> {
> struct vxge_hw_mempool_dma *dma_object;
>
> @@ -1252,7 +1411,7 @@ exit:
> * This function creates Ring and initializes it.
> *
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_ring_create(struct __vxge_hw_vpath_handle *vp,
> struct vxge_hw_ring_attr *attr)
> {
> @@ -1363,7 +1522,7 @@ exit:
> * __vxge_hw_ring_abort - Returns the RxD
> * This function terminates the RxDs of ring
> */
> -enum vxge_hw_status __vxge_hw_ring_abort(struct __vxge_hw_ring *ring)
> +static enum vxge_hw_status __vxge_hw_ring_abort(struct __vxge_hw_ring *ring)
> {
> void *rxdh;
> struct __vxge_hw_channel *channel;
> @@ -1392,7 +1551,7 @@ enum vxge_hw_status __vxge_hw_ring_abort
> * __vxge_hw_ring_reset - Resets the ring
> * This function resets the ring during vpath reset operation
> */
> -enum vxge_hw_status __vxge_hw_ring_reset(struct __vxge_hw_ring *ring)
> +static enum vxge_hw_status __vxge_hw_ring_reset(struct __vxge_hw_ring *ring)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> struct __vxge_hw_channel *channel;
> @@ -1419,7 +1578,7 @@ exit:
> * __vxge_hw_ring_delete - Removes the ring
> * This function freeup the memory pool and removes the ring
> */
> -enum vxge_hw_status __vxge_hw_ring_delete(struct __vxge_hw_vpath_handle *vp)
> +static enum vxge_hw_status __vxge_hw_ring_delete(struct __vxge_hw_vpath_handle *vp)
> {
> struct __vxge_hw_ring *ring = vp->vpath->ringh;
>
> @@ -1438,7 +1597,7 @@ enum vxge_hw_status __vxge_hw_ring_delet
> * __vxge_hw_mempool_grow
> * Will resize mempool up to %num_allocate value.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_mempool_grow(struct vxge_hw_mempool *mempool, u32 num_allocate,
> u32 *num_allocated)
> {
> @@ -1527,7 +1686,7 @@ exit:
> * with size enough to hold %items_initial number of items. Memory is
> * DMA-able but client must map/unmap before interoperating with the device.
> */
> -struct vxge_hw_mempool*
> +static struct vxge_hw_mempool*
> __vxge_hw_mempool_create(
> struct __vxge_hw_device *devh,
> u32 memblock_size,
> @@ -1644,7 +1803,7 @@ exit:
> /*
> * vxge_hw_mempool_destroy
> */
> -void __vxge_hw_mempool_destroy(struct vxge_hw_mempool *mempool)
> +static void __vxge_hw_mempool_destroy(struct vxge_hw_mempool *mempool)
> {
> u32 i, j;
> struct __vxge_hw_device *devh = mempool->devh;
> @@ -1700,7 +1859,7 @@ __vxge_hw_device_fifo_config_check(struc
> * __vxge_hw_device_vpath_config_check - Check vpath configuration.
> * Check the vpath configuration
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_device_vpath_config_check(struct vxge_hw_vp_config *vp_config)
> {
> enum vxge_hw_status status;
> @@ -1922,7 +2081,7 @@ vxge_hw_device_config_default_get(struct
> * _hw_legacy_swapper_set - Set the swapper bits for the legacy secion.
> * Set the swapper bits appropriately for the lagacy section.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_legacy_swapper_set(struct vxge_hw_legacy_reg __iomem *legacy_reg)
> {
> u64 val64;
> @@ -1977,7 +2136,7 @@ __vxge_hw_legacy_swapper_set(struct vxge
> * __vxge_hw_vpath_swapper_set - Set the swapper bits for the vpath.
> * Set the swapper bits appropriately for the vpath.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_swapper_set(struct vxge_hw_vpath_reg __iomem *vpath_reg)
> {
> #ifndef __BIG_ENDIAN
> @@ -1996,7 +2155,7 @@ __vxge_hw_vpath_swapper_set(struct vxge_
> * __vxge_hw_kdfc_swapper_set - Set the swapper bits for the kdfc.
> * Set the swapper bits appropriately for the vpath.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_kdfc_swapper_set(
> struct vxge_hw_legacy_reg __iomem *legacy_reg,
> struct vxge_hw_vpath_reg __iomem *vpath_reg)
> @@ -2021,28 +2180,6 @@ __vxge_hw_kdfc_swapper_set(
> }
>
> /*
> - * vxge_hw_mgmt_device_config - Retrieve device configuration.
> - * Get device configuration. Permits to retrieve at run-time configuration
> - * values that were used to initialize and configure the device.
> - */
> -enum vxge_hw_status
> -vxge_hw_mgmt_device_config(struct __vxge_hw_device *hldev,
> - struct vxge_hw_device_config *dev_config, int size)
> -{
> -
> - if ((hldev == NULL) || (hldev->magic != VXGE_HW_DEVICE_MAGIC))
> - return VXGE_HW_ERR_INVALID_DEVICE;
> -
> - if (size != sizeof(struct vxge_hw_device_config))
> - return VXGE_HW_ERR_VERSION_CONFLICT;
> -
> - memcpy(dev_config, &hldev->config,
> - sizeof(struct vxge_hw_device_config));
> -
> - return VXGE_HW_OK;
> -}
> -
> -/*
> * vxge_hw_mgmt_reg_read - Read Titan register.
> */
> enum vxge_hw_status
> @@ -2438,7 +2575,7 @@ exit:
> * __vxge_hw_fifo_abort - Returns the TxD
> * This function terminates the TxDs of fifo
> */
> -enum vxge_hw_status __vxge_hw_fifo_abort(struct __vxge_hw_fifo *fifo)
> +static enum vxge_hw_status __vxge_hw_fifo_abort(struct __vxge_hw_fifo *fifo)
> {
> void *txdlh;
>
> @@ -2466,7 +2603,7 @@ enum vxge_hw_status __vxge_hw_fifo_abort
> * __vxge_hw_fifo_reset - Resets the fifo
> * This function resets the fifo during vpath reset operation
> */
> -enum vxge_hw_status __vxge_hw_fifo_reset(struct __vxge_hw_fifo *fifo)
> +static enum vxge_hw_status __vxge_hw_fifo_reset(struct __vxge_hw_fifo *fifo)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
>
> @@ -2501,7 +2638,7 @@ enum vxge_hw_status __vxge_hw_fifo_delet
> * in pci config space.
> * Read from the vpath pci config space.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_pci_read(struct __vxge_hw_virtualpath *vpath,
> u32 phy_func_0, u32 offset, u32 *val)
> {
> @@ -2542,7 +2679,7 @@ exit:
> * __vxge_hw_vpath_func_id_get - Get the function id of the vpath.
> * Returns the function number of the vpath.
> */
> -u32
> +static u32
> __vxge_hw_vpath_func_id_get(u32 vp_id,
> struct vxge_hw_vpmgmt_reg __iomem *vpmgmt_reg)
> {
> @@ -2573,7 +2710,7 @@ __vxge_hw_read_rts_ds(struct vxge_hw_vpa
> * __vxge_hw_vpath_card_info_get - Get the serial numbers,
> * part number and product description.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_card_info_get(
> u32 vp_id,
> struct vxge_hw_vpath_reg __iomem *vpath_reg,
> @@ -2695,7 +2832,7 @@ __vxge_hw_vpath_card_info_get(
> * __vxge_hw_vpath_fw_ver_get - Get the fw version
> * Returns FW Version
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_fw_ver_get(
> u32 vp_id,
> struct vxge_hw_vpath_reg __iomem *vpath_reg,
> @@ -2789,7 +2926,7 @@ exit:
> * __vxge_hw_vpath_pci_func_mode_get - Get the pci mode
> * Returns pci function mode
> */
> -u64
> +static u64
> __vxge_hw_vpath_pci_func_mode_get(
> u32 vp_id,
> struct vxge_hw_vpath_reg __iomem *vpath_reg)
> @@ -2995,7 +3132,7 @@ exit:
> * __vxge_hw_vpath_addr_get - Get the hw address entry for this vpath
> * from MAC address table.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_addr_get(
> u32 vp_id, struct vxge_hw_vpath_reg __iomem *vpath_reg,
> u8 (macaddr)[ETH_ALEN], u8 (macaddr_mask)[ETH_ALEN])
> @@ -3347,7 +3484,7 @@ __vxge_hw_vpath_mgmt_read(
> * This routine checks the vpath_rst_in_prog register to see if
> * adapter completed the reset process for the vpath
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_reset_check(struct __vxge_hw_virtualpath *vpath)
> {
> enum vxge_hw_status status;
> @@ -3365,7 +3502,7 @@ __vxge_hw_vpath_reset_check(struct __vxg
> * __vxge_hw_vpath_reset
> * This routine resets the vpath on the device
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_reset(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> u64 val64;
> @@ -3383,7 +3520,7 @@ __vxge_hw_vpath_reset(struct __vxge_hw_d
> * __vxge_hw_vpath_sw_reset
> * This routine resets the vpath structures
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_sw_reset(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> @@ -3408,7 +3545,7 @@ exit:
> * This routine configures the prc registers of virtual path using the config
> * passed
> */
> -void
> +static void
> __vxge_hw_vpath_prc_configure(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> u64 val64;
> @@ -3480,7 +3617,7 @@ __vxge_hw_vpath_prc_configure(struct __v
> * This routine configures the kdfc registers of virtual path using the
> * config passed
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_kdfc_configure(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> u64 val64;
> @@ -3553,7 +3690,7 @@ exit:
> * __vxge_hw_vpath_mac_configure
> * This routine configures the mac of virtual path using the config passed
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_mac_configure(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> u64 val64;
> @@ -3621,7 +3758,7 @@ __vxge_hw_vpath_mac_configure(struct __v
> * This routine configures the tim registers of virtual path using the config
> * passed
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> u64 val64;
> @@ -3897,7 +4034,7 @@ vxge_hw_vpath_tti_ci_set(struct __vxge_h
> * This routine is the final phase of init which initializes the
> * registers of the vpath using the configuration passed.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_initialize(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> u64 val64;
> @@ -3966,7 +4103,7 @@ exit:
> * This routine is the initial phase of init which resets the vpath and
> * initializes the software support structures.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vp_initialize(struct __vxge_hw_device *hldev, u32 vp_id,
> struct vxge_hw_vp_config *config)
> {
> @@ -4022,7 +4159,7 @@ exit:
> * __vxge_hw_vp_terminate - Terminate Virtual Path structure
> * This routine closes all channels it opened and freeup memory
> */
> -void
> +static void
> __vxge_hw_vp_terminate(struct __vxge_hw_device *hldev, u32 vp_id)
> {
> struct __vxge_hw_virtualpath *vpath;
> @@ -4384,7 +4521,7 @@ vxge_hw_vpath_enable(struct __vxge_hw_vp
> * Enable the DMA vpath statistics. The function is to be called to re-enable
> * the adapter to update stats into the host memory
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> vxge_hw_vpath_stats_enable(struct __vxge_hw_vpath_handle *vp)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> @@ -4409,7 +4546,7 @@ exit:
> * __vxge_hw_vpath_stats_access - Get the statistics from the given location
> * and offset and perform an operation
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_stats_access(struct __vxge_hw_virtualpath *vpath,
> u32 operation, u32 offset, u64 *stat)
> {
> @@ -4445,7 +4582,7 @@ vpath_stats_access_exit:
> /*
> * __vxge_hw_vpath_xmac_tx_stats_get - Get the TX Statistics of a vpath
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_xmac_tx_stats_get(
> struct __vxge_hw_virtualpath *vpath,
> struct vxge_hw_xmac_vpath_tx_stats *vpath_tx_stats)
> @@ -4478,9 +4615,9 @@ exit:
> /*
> * __vxge_hw_vpath_xmac_rx_stats_get - Get the RX Statistics of a vpath
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_vpath_xmac_rx_stats_get(struct __vxge_hw_virtualpath *vpath,
> - struct vxge_hw_xmac_vpath_rx_stats *vpath_rx_stats)
> + struct vxge_hw_xmac_vpath_rx_stats *vpath_rx_stats)
> {
> u64 *val64;
> enum vxge_hw_status status = VXGE_HW_OK;
> @@ -4509,9 +4646,9 @@ exit:
> /*
> * __vxge_hw_vpath_stats_get - Get the vpath hw statistics.
> */
> -enum vxge_hw_status __vxge_hw_vpath_stats_get(
> - struct __vxge_hw_virtualpath *vpath,
> - struct vxge_hw_vpath_stats_hw_info *hw_stats)
> +static enum vxge_hw_status
> +__vxge_hw_vpath_stats_get(struct __vxge_hw_virtualpath *vpath,
> + struct vxge_hw_vpath_stats_hw_info *hw_stats)
> {
> u64 val64;
> enum vxge_hw_status status = VXGE_HW_OK;
> @@ -4643,6 +4780,32 @@ exit:
> return status;
> }
>
> +
> +static void vxge_os_dma_malloc_async(struct pci_dev *pdev, void *devh,
> + unsigned long size)
> +{
> + gfp_t flags;
> + void *vaddr;
> +
> + if (in_interrupt())
> + flags = GFP_ATOMIC | GFP_DMA;
> + else
> + flags = GFP_KERNEL | GFP_DMA;
> +
> + vaddr = kmalloc((size), flags);
> +
> + vxge_hw_blockpool_block_add(devh, vaddr, size, pdev, pdev);
> +}
> +
> +static void vxge_os_dma_free(struct pci_dev *pdev, const void *vaddr,
> + struct pci_dev **p_dma_acch)
> +{
> + unsigned long misaligned = *(unsigned long *)p_dma_acch;
> + u8 *tmp = (u8 *)vaddr;
> + tmp -= misaligned;
> + kfree((void *)tmp);
> +}
> +
> /*
> * __vxge_hw_blockpool_create - Create block pool
> */
> @@ -4845,12 +5008,11 @@ void __vxge_hw_blockpool_blocks_remove(s
> * vxge_hw_blockpool_block_add - callback for vxge_os_dma_malloc_async
> * Adds a block to block pool
> */
> -void vxge_hw_blockpool_block_add(
> - struct __vxge_hw_device *devh,
> - void *block_addr,
> - u32 length,
> - struct pci_dev *dma_h,
> - struct pci_dev *acc_handle)
> +static void vxge_hw_blockpool_block_add(struct __vxge_hw_device *devh,
> + void *block_addr,
> + u32 length,
> + struct pci_dev *dma_h,
> + struct pci_dev *acc_handle)
> {
> struct __vxge_hw_blockpool *blockpool;
> struct __vxge_hw_blockpool_entry *entry = NULL;
> --- a/drivers/net/vxge/vxge-config.h 2010-10-15 09:10:06.766402819 -0700
> +++ b/drivers/net/vxge/vxge-config.h 2010-10-15 10:14:19.925408165 -0700
> @@ -183,11 +183,6 @@ struct vxge_hw_device_version {
> char version[VXGE_HW_FW_STRLEN];
> };
>
> -u64
> -__vxge_hw_vpath_pci_func_mode_get(
> - u32 vp_id,
> - struct vxge_hw_vpath_reg __iomem *vpath_reg);
> -
> /**
> * struct vxge_hw_fifo_config - Configuration of fifo.
> * @enable: Is this fifo to be commissioned
> @@ -1426,9 +1421,6 @@ struct vxge_hw_rth_hash_types {
> u8 hash_type_ipv6ex_en;
> };
>
> -u32
> -vxge_hw_device_debug_mask_get(struct __vxge_hw_device *devh);
> -
> void vxge_hw_device_debug_set(
> struct __vxge_hw_device *devh,
> enum vxge_debug_level level,
> @@ -1440,9 +1432,6 @@ vxge_hw_device_error_level_get(struct __
> u32
> vxge_hw_device_trace_level_get(struct __vxge_hw_device *devh);
>
> -u32
> -vxge_hw_device_debug_mask_get(struct __vxge_hw_device *devh);
> -
> /**
> * vxge_hw_ring_rxd_size_get - Get the size of ring descriptor.
> * @buf_mode: Buffer mode (1, 3 or 5)
> @@ -1817,60 +1806,10 @@ struct vxge_hw_vpath_attr {
> struct vxge_hw_fifo_attr fifo_attr;
> };
>
> -enum vxge_hw_status
> -__vxge_hw_blockpool_create(struct __vxge_hw_device *hldev,
> - struct __vxge_hw_blockpool *blockpool,
> - u32 pool_size,
> - u32 pool_max);
> -
> -void
> -__vxge_hw_blockpool_destroy(struct __vxge_hw_blockpool *blockpool);
> -
> -struct __vxge_hw_blockpool_entry *
> -__vxge_hw_blockpool_block_allocate(struct __vxge_hw_device *hldev,
> - u32 size);
> -
> -void
> -__vxge_hw_blockpool_block_free(struct __vxge_hw_device *hldev,
> - struct __vxge_hw_blockpool_entry *entry);
> -
> -void *
> -__vxge_hw_blockpool_malloc(struct __vxge_hw_device *hldev,
> - u32 size,
> - struct vxge_hw_mempool_dma *dma_object);
> -
> -void
> -__vxge_hw_blockpool_free(struct __vxge_hw_device *hldev,
> - void *memblock,
> - u32 size,
> - struct vxge_hw_mempool_dma *dma_object);
> -
> -enum vxge_hw_status
> -__vxge_hw_device_fifo_config_check(struct vxge_hw_fifo_config *fifo_config);
> -
> -enum vxge_hw_status
> -__vxge_hw_device_config_check(struct vxge_hw_device_config *new_config);
> -
> -enum vxge_hw_status
> -vxge_hw_mgmt_device_config(struct __vxge_hw_device *devh,
> - struct vxge_hw_device_config *dev_config, int size);
> -
> enum vxge_hw_status __devinit vxge_hw_device_hw_info_get(
> void __iomem *bar0,
> struct vxge_hw_device_hw_info *hw_info);
>
> -enum vxge_hw_status
> -__vxge_hw_vpath_fw_ver_get(
> - u32 vp_id,
> - struct vxge_hw_vpath_reg __iomem *vpath_reg,
> - struct vxge_hw_device_hw_info *hw_info);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_card_info_get(
> - u32 vp_id,
> - struct vxge_hw_vpath_reg __iomem *vpath_reg,
> - struct vxge_hw_device_hw_info *hw_info);
> -
> enum vxge_hw_status __devinit vxge_hw_device_config_default_get(
> struct vxge_hw_device_config *device_config);
>
> @@ -1954,38 +1893,6 @@ out:
> return vaddr;
> }
>
> -extern void vxge_hw_blockpool_block_add(
> - struct __vxge_hw_device *devh,
> - void *block_addr,
> - u32 length,
> - struct pci_dev *dma_h,
> - struct pci_dev *acc_handle);
> -
> -static inline void vxge_os_dma_malloc_async(struct pci_dev *pdev, void *devh,
> - unsigned long size)
> -{
> - gfp_t flags;
> - void *vaddr;
> -
> - if (in_interrupt())
> - flags = GFP_ATOMIC | GFP_DMA;
> - else
> - flags = GFP_KERNEL | GFP_DMA;
> -
> - vaddr = kmalloc((size), flags);
> -
> - vxge_hw_blockpool_block_add(devh, vaddr, size, pdev, pdev);
> -}
> -
> -static inline void vxge_os_dma_free(struct pci_dev *pdev, const void *vaddr,
> - struct pci_dev **p_dma_acch)
> -{
> - unsigned long misaligned = *(unsigned long *)p_dma_acch;
> - u8 *tmp = (u8 *)vaddr;
> - tmp -= misaligned;
> - kfree((void *)tmp);
> -}
> -
> /*
> * __vxge_hw_mempool_item_priv - will return pointer on per item private space
> */
> @@ -2010,40 +1917,6 @@ __vxge_hw_mempool_item_priv(
> (*memblock_item_idx) * mempool->items_priv_size;
> }
>
> -enum vxge_hw_status
> -__vxge_hw_mempool_grow(
> - struct vxge_hw_mempool *mempool,
> - u32 num_allocate,
> - u32 *num_allocated);
> -
> -struct vxge_hw_mempool*
> -__vxge_hw_mempool_create(
> - struct __vxge_hw_device *devh,
> - u32 memblock_size,
> - u32 item_size,
> - u32 private_size,
> - u32 items_initial,
> - u32 items_max,
> - struct vxge_hw_mempool_cbs *mp_callback,
> - void *userdata);
> -
> -struct __vxge_hw_channel*
> -__vxge_hw_channel_allocate(struct __vxge_hw_vpath_handle *vph,
> - enum __vxge_hw_channel_type type, u32 length,
> - u32 per_dtr_space, void *userdata);
> -
> -void
> -__vxge_hw_channel_free(
> - struct __vxge_hw_channel *channel);
> -
> -enum vxge_hw_status
> -__vxge_hw_channel_initialize(
> - struct __vxge_hw_channel *channel);
> -
> -enum vxge_hw_status
> -__vxge_hw_channel_reset(
> - struct __vxge_hw_channel *channel);
> -
> /*
> * __vxge_hw_fifo_txdl_priv - Return the max fragments allocated
> * for the fifo.
> @@ -2065,9 +1938,6 @@ enum vxge_hw_status vxge_hw_vpath_open(
> struct vxge_hw_vpath_attr *attr,
> struct __vxge_hw_vpath_handle **vpath_handle);
>
> -enum vxge_hw_status
> -__vxge_hw_device_vpath_reset_in_prog_check(u64 __iomem *vpath_rst_in_prog);
> -
> enum vxge_hw_status vxge_hw_vpath_close(
> struct __vxge_hw_vpath_handle *vpath_handle);
>
> @@ -2089,54 +1959,9 @@ enum vxge_hw_status vxge_hw_vpath_mtu_se
> struct __vxge_hw_vpath_handle *vpath_handle,
> u32 new_mtu);
>
> -enum vxge_hw_status vxge_hw_vpath_stats_enable(
> - struct __vxge_hw_vpath_handle *vpath_handle);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_stats_access(
> - struct __vxge_hw_virtualpath *vpath,
> - u32 operation,
> - u32 offset,
> - u64 *stat);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_xmac_tx_stats_get(
> - struct __vxge_hw_virtualpath *vpath,
> - struct vxge_hw_xmac_vpath_tx_stats *vpath_tx_stats);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_xmac_rx_stats_get(
> - struct __vxge_hw_virtualpath *vpath,
> - struct vxge_hw_xmac_vpath_rx_stats *vpath_rx_stats);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_stats_get(
> - struct __vxge_hw_virtualpath *vpath,
> - struct vxge_hw_vpath_stats_hw_info *hw_stats);
> -
> void
> vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp);
>
> -enum vxge_hw_status
> -__vxge_hw_device_vpath_config_check(struct vxge_hw_vp_config *vp_config);
> -
> -void
> -__vxge_hw_device_pci_e_init(struct __vxge_hw_device *hldev);
> -
> -enum vxge_hw_status
> -__vxge_hw_legacy_swapper_set(struct vxge_hw_legacy_reg __iomem *legacy_reg);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_swapper_set(struct vxge_hw_vpath_reg __iomem *vpath_reg);
> -
> -enum vxge_hw_status
> -__vxge_hw_kdfc_swapper_set(struct vxge_hw_legacy_reg __iomem *legacy_reg,
> - struct vxge_hw_vpath_reg __iomem *vpath_reg);
> -
> -enum vxge_hw_status
> -__vxge_hw_device_register_poll(
> - void __iomem *reg,
> - u64 mask, u32 max_millis);
>
> #ifndef readq
> static inline u64 readq(void __iomem *addr)
> @@ -2168,62 +1993,12 @@ static inline void __vxge_hw_pio_mem_wri
> writel(val, addr);
> }
>
> -static inline enum vxge_hw_status
> -__vxge_hw_pio_mem_write64(u64 val64, void __iomem *addr,
> - u64 mask, u32 max_millis)
> -{
> - enum vxge_hw_status status = VXGE_HW_OK;
> -
> - __vxge_hw_pio_mem_write32_lower((u32)vxge_bVALn(val64, 32, 32), addr);
> - wmb();
> - __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32), addr);
> - wmb();
> -
> - status = __vxge_hw_device_register_poll(addr, mask, max_millis);
> - return status;
> -}
> -
> -struct vxge_hw_toc_reg __iomem *
> -__vxge_hw_device_toc_get(void __iomem *bar0);
> -
> -enum vxge_hw_status
> -__vxge_hw_device_reg_addr_get(struct __vxge_hw_device *hldev);
> -
> -void
> -__vxge_hw_device_id_get(struct __vxge_hw_device *hldev);
> -
> -void
> -__vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev);
> -
> enum vxge_hw_status
> vxge_hw_device_flick_link_led(struct __vxge_hw_device *devh, u64 on_off);
>
> enum vxge_hw_status
> -__vxge_hw_device_initialize(struct __vxge_hw_device *hldev);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_pci_read(
> - struct __vxge_hw_virtualpath *vpath,
> - u32 phy_func_0,
> - u32 offset,
> - u32 *val);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_addr_get(
> - u32 vp_id,
> - struct vxge_hw_vpath_reg __iomem *vpath_reg,
> - u8 (macaddr)[ETH_ALEN],
> - u8 (macaddr_mask)[ETH_ALEN]);
> -
> -u32
> -__vxge_hw_vpath_func_id_get(
> - u32 vp_id, struct vxge_hw_vpmgmt_reg __iomem *vpmgmt_reg);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_reset_check(struct __vxge_hw_virtualpath *vpath);
> -
> -enum vxge_hw_status
> vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask);
> +
> /**
> * vxge_debug
> * @level: level of debug verbosity.
> --- a/drivers/net/vxge/vxge-main.c 2010-10-15 09:10:06.734401351 -0700
> +++ b/drivers/net/vxge/vxge-main.c 2010-10-15 10:13:44.000142249 -0700
> @@ -82,6 +82,16 @@ module_param_array(bw_percentage, uint,
>
> static struct vxge_drv_config *driver_config;
>
> +static enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev,
> + struct macInfo *mac);
> +static enum vxge_hw_status vxge_del_mac_addr(struct vxgedev *vdev,
> + struct macInfo *mac);
> +static int vxge_mac_list_add(struct vxge_vpath *vpath, struct macInfo *mac);
> +static int vxge_mac_list_del(struct vxge_vpath *vpath, struct macInfo *mac);
> +static enum vxge_hw_status vxge_restore_vpath_vid_table(struct vxge_vpath *vpath);
> +static enum vxge_hw_status vxge_restore_vpath_mac_addr(struct vxge_vpath *vpath);
> +static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
> +
> static inline int is_vxge_card_up(struct vxgedev *vdev)
> {
> return test_bit(__VXGE_STATE_CARD_UP, &vdev->state);
> @@ -138,7 +148,7 @@ static inline void VXGE_COMPLETE_ALL_RX(
> * This function is called during interrupt context to notify link up state
> * change.
> */
> -void
> +static void
> vxge_callback_link_up(struct __vxge_hw_device *hldev)
> {
> struct net_device *dev = hldev->ndev;
> @@ -162,7 +172,7 @@ vxge_callback_link_up(struct __vxge_hw_d
> * This function is called during interrupt context to notify link down state
> * change.
> */
> -void
> +static void
> vxge_callback_link_down(struct __vxge_hw_device *hldev)
> {
> struct net_device *dev = hldev->ndev;
> @@ -354,7 +364,7 @@ static inline void vxge_post(int *dtr_cn
> * If the interrupt is because of a received frame or if the receive ring
> * contains fresh as yet un-processed frames, this function is called.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
> u8 t_code, void *userdata)
> {
> @@ -531,7 +541,7 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *
> * freed and frees all skbs whose data have already DMA'ed into the NICs
> * internal memory.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> vxge_xmit_compl(struct __vxge_hw_fifo *fifo_hw, void *dtr,
> enum vxge_hw_fifo_tcode t_code, void *userdata,
> struct sk_buff ***skb_ptr, int nr_skb, int *more)
> @@ -1246,7 +1256,7 @@ static int vxge_set_mac_addr(struct net_
> *
> * Enables the interrupts for the vpath
> */
> -void vxge_vpath_intr_enable(struct vxgedev *vdev, int vp_id)
> +static void vxge_vpath_intr_enable(struct vxgedev *vdev, int vp_id)
> {
> struct vxge_vpath *vpath = &vdev->vpaths[vp_id];
> int msix_id = 0;
> @@ -1279,7 +1289,7 @@ void vxge_vpath_intr_enable(struct vxged
> *
> * Disables the interrupts for the vpath
> */
> -void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
> +static void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
> {
> struct vxge_vpath *vpath = &vdev->vpaths[vp_id];
> int msix_id;
> @@ -1553,7 +1563,7 @@ out:
> *
> * driver may reset the chip on events of serr, eccerr, etc
> */
> -int vxge_reset(struct vxgedev *vdev)
> +static int vxge_reset(struct vxgedev *vdev)
> {
> return do_vxge_reset(vdev, VXGE_LL_FULL_RESET);
> }
> @@ -1724,7 +1734,7 @@ static enum vxge_hw_status vxge_rth_conf
> return status;
> }
>
> -int vxge_mac_list_add(struct vxge_vpath *vpath, struct macInfo *mac)
> +static int vxge_mac_list_add(struct vxge_vpath *vpath, struct macInfo *mac)
> {
> struct vxge_mac_addrs *new_mac_entry;
> u8 *mac_address = NULL;
> @@ -1757,7 +1767,8 @@ int vxge_mac_list_add(struct vxge_vpath
> }
>
> /* Add a mac address to DA table */
> -enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev, struct macInfo *mac)
> +static enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev,
> + struct macInfo *mac)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> struct vxge_vpath *vpath;
> @@ -1782,7 +1793,7 @@ enum vxge_hw_status vxge_add_mac_addr(st
> return status;
> }
>
> -int vxge_mac_list_del(struct vxge_vpath *vpath, struct macInfo *mac)
> +static int vxge_mac_list_del(struct vxge_vpath *vpath, struct macInfo *mac)
> {
> struct list_head *entry, *next;
> u64 del_mac = 0;
> @@ -1807,7 +1818,8 @@ int vxge_mac_list_del(struct vxge_vpath
> return FALSE;
> }
> /* delete a mac address from DA table */
> -enum vxge_hw_status vxge_del_mac_addr(struct vxgedev *vdev, struct macInfo *mac)
> +static enum vxge_hw_status vxge_del_mac_addr(struct vxgedev *vdev,
> + struct macInfo *mac)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> struct vxge_vpath *vpath;
> @@ -1854,7 +1866,7 @@ static vxge_search_mac_addr_in_da_table(
> }
>
> /* Store all vlan ids from the list to the vid table */
> -enum vxge_hw_status vxge_restore_vpath_vid_table(struct vxge_vpath *vpath)
> +static enum vxge_hw_status vxge_restore_vpath_vid_table(struct vxge_vpath *vpath)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> struct vxgedev *vdev = vpath->vdev;
> @@ -1874,7 +1886,7 @@ enum vxge_hw_status vxge_restore_vpath_v
> }
>
> /* Store all mac addresses from the list to the DA table */
> -enum vxge_hw_status vxge_restore_vpath_mac_addr(struct vxge_vpath *vpath)
> +static enum vxge_hw_status vxge_restore_vpath_mac_addr(struct vxge_vpath *vpath)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> struct macInfo mac_info;
> @@ -1916,7 +1928,7 @@ enum vxge_hw_status vxge_restore_vpath_m
> }
>
> /* reset vpaths */
> -enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
> +static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
> {
> enum vxge_hw_status status = VXGE_HW_OK;
> struct vxge_vpath *vpath;
> @@ -1948,7 +1960,7 @@ enum vxge_hw_status vxge_reset_all_vpath
> }
>
> /* close vpaths */
> -void vxge_close_vpaths(struct vxgedev *vdev, int index)
> +static void vxge_close_vpaths(struct vxgedev *vdev, int index)
> {
> struct vxge_vpath *vpath;
> int i;
> @@ -1966,7 +1978,7 @@ void vxge_close_vpaths(struct vxgedev *v
> }
>
> /* open vpaths */
> -int vxge_open_vpaths(struct vxgedev *vdev)
> +static int vxge_open_vpaths(struct vxgedev *vdev)
> {
> struct vxge_hw_vpath_attr attr;
> enum vxge_hw_status status;
> @@ -2517,7 +2529,7 @@ static void vxge_poll_vp_lockup(unsigned
> * Return value: '0' on success and an appropriate (-)ve integer as
> * defined in errno.h file on failure.
> */
> -int
> +static int
> vxge_open(struct net_device *dev)
> {
> enum vxge_hw_status status;
> @@ -2721,7 +2733,7 @@ out0:
> }
>
> /* Loop throught the mac address list and delete all the entries */
> -void vxge_free_mac_add_list(struct vxge_vpath *vpath)
> +static void vxge_free_mac_add_list(struct vxge_vpath *vpath)
> {
>
> struct list_head *entry, *next;
> @@ -2745,7 +2757,7 @@ static void vxge_napi_del_all(struct vxg
> }
> }
>
> -int do_vxge_close(struct net_device *dev, int do_io)
> +static int do_vxge_close(struct net_device *dev, int do_io)
> {
> enum vxge_hw_status status;
> struct vxgedev *vdev;
> @@ -2856,7 +2868,7 @@ int do_vxge_close(struct net_device *dev
> * Return value: '0' on success and an appropriate (-)ve integer as
> * defined in errno.h file on failure.
> */
> -int
> +static int
> vxge_close(struct net_device *dev)
> {
> do_vxge_close(dev, 1);
> @@ -3113,10 +3125,10 @@ static const struct net_device_ops vxge_
> #endif
> };
>
> -int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
> - struct vxge_config *config,
> - int high_dma, int no_of_vpath,
> - struct vxgedev **vdev_out)
> +static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
> + struct vxge_config *config,
> + int high_dma, int no_of_vpath,
> + struct vxgedev **vdev_out)
> {
> struct net_device *ndev;
> enum vxge_hw_status status = VXGE_HW_OK;
> @@ -3164,7 +3176,7 @@ int __devinit vxge_device_register(struc
>
> ndev->watchdog_timeo = VXGE_LL_WATCH_DOG_TIMEOUT;
>
> - initialize_ethtool_ops(ndev);
> + vxge_initialize_ethtool_ops(ndev);
>
> /* Allocate memory for vpath */
> vdev->vpaths = kzalloc((sizeof(struct vxge_vpath)) *
> @@ -3249,7 +3261,7 @@ _out0:
> *
> * This function will unregister and free network device
> */
> -void
> +static void
> vxge_device_unregister(struct __vxge_hw_device *hldev)
> {
> struct vxgedev *vdev;
> --- a/drivers/net/vxge/vxge-main.h 2010-10-15 09:10:06.802404471 -0700
> +++ b/drivers/net/vxge/vxge-main.h 2010-10-15 10:13:51.232396166 -0700
> @@ -396,64 +396,7 @@ struct vxge_tx_priv {
> mod_timer(&timer, (jiffies + exp)); \
> } while (0);
>
> -int __devinit vxge_device_register(struct __vxge_hw_device *devh,
> - struct vxge_config *config,
> - int high_dma, int no_of_vpath,
> - struct vxgedev **vdev);
> -
> -void vxge_device_unregister(struct __vxge_hw_device *devh);
> -
> -void vxge_vpath_intr_enable(struct vxgedev *vdev, int vp_id);
> -
> -void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id);
> -
> -void vxge_callback_link_up(struct __vxge_hw_device *devh);
> -
> -void vxge_callback_link_down(struct __vxge_hw_device *devh);
> -
> -enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev,
> - struct macInfo *mac);
> -
> -int vxge_mac_list_del(struct vxge_vpath *vpath, struct macInfo *mac);
> -
> -int vxge_reset(struct vxgedev *vdev);
> -
> -enum vxge_hw_status
> -vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
> - u8 t_code, void *userdata);
> -
> -enum vxge_hw_status
> -vxge_xmit_compl(struct __vxge_hw_fifo *fifo_hw, void *dtr,
> - enum vxge_hw_fifo_tcode t_code, void *userdata,
> - struct sk_buff ***skb_ptr, int nr_skbs, int *more);
> -
> -int vxge_close(struct net_device *dev);
> -
> -int vxge_open(struct net_device *dev);
> -
> -void vxge_close_vpaths(struct vxgedev *vdev, int index);
> -
> -int vxge_open_vpaths(struct vxgedev *vdev);
> -
> -enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
> -
> -enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev,
> - struct macInfo *mac);
> -
> -enum vxge_hw_status vxge_del_mac_addr(struct vxgedev *vdev,
> - struct macInfo *mac);
> -
> -int vxge_mac_list_add(struct vxge_vpath *vpath,
> - struct macInfo *mac);
> -
> -void vxge_free_mac_add_list(struct vxge_vpath *vpath);
> -
> -enum vxge_hw_status vxge_restore_vpath_mac_addr(struct vxge_vpath *vpath);
> -
> -enum vxge_hw_status vxge_restore_vpath_vid_table(struct vxge_vpath *vpath);
> -
> -int do_vxge_close(struct net_device *dev, int do_io);
> -extern void initialize_ethtool_ops(struct net_device *ndev);
> +extern void vxge_initialize_ethtool_ops(struct net_device *ndev);
> /**
> * #define VXGE_DEBUG_INIT: debug for initialization functions
> * #define VXGE_DEBUG_TX : debug transmit related functions
> --- a/drivers/net/vxge/vxge-traffic.c 2010-10-15 09:10:06.750402084 -0700
> +++ b/drivers/net/vxge/vxge-traffic.c 2010-10-15 09:36:10.750557049 -0700
> @@ -17,6 +17,13 @@
> #include "vxge-config.h"
> #include "vxge-main.h"
>
> +static enum vxge_hw_status
> +__vxge_hw_device_handle_error(struct __vxge_hw_device *hldev,
> + u32 vp_id, enum vxge_hw_event type);
> +static enum vxge_hw_status
> +__vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath,
> + u32 skip_alarms);
> +
> /*
> * vxge_hw_vpath_intr_enable - Enable vpath interrupts.
> * @vp: Virtual Path handle.
> @@ -513,7 +520,7 @@ exit:
> * Link up indication handler. The function is invoked by HW when
> * Titan indicates that the link is up for programmable amount of time.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_device_handle_link_up_ind(struct __vxge_hw_device *hldev)
> {
> /*
> @@ -538,7 +545,7 @@ exit:
> * Link down indication handler. The function is invoked by HW when
> * Titan indicates that the link is down.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_device_handle_link_down_ind(struct __vxge_hw_device *hldev)
> {
> /*
> @@ -564,7 +571,7 @@ exit:
> *
> * Handle error.
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> __vxge_hw_device_handle_error(
> struct __vxge_hw_device *hldev,
> u32 vp_id,
> @@ -646,7 +653,7 @@ void vxge_hw_device_clear_tx_rx(struct _
> * it swaps the reserve and free arrays.
> *
> */
> -enum vxge_hw_status
> +static enum vxge_hw_status
> vxge_hw_channel_dtr_alloc(struct __vxge_hw_channel *channel, void **dtrh)
> {
> void **tmp_arr;
> @@ -692,7 +699,8 @@ _alloc_after_swap:
> * Posts a dtr to work array.
> *
> */
> -void vxge_hw_channel_dtr_post(struct __vxge_hw_channel *channel, void *dtrh)
> +static void vxge_hw_channel_dtr_post(struct __vxge_hw_channel *channel,
> + void *dtrh)
> {
> vxge_assert(channel->work_arr[channel->post_index] == NULL);
>
> @@ -1658,37 +1666,6 @@ exit:
> }
>
> /**
> - * vxge_hw_vpath_vid_get_next - Get the next vid entry for this vpath
> - * from vlan id table.
> - * @vp: Vpath handle.
> - * @vid: Buffer to return vlan id
> - *
> - * Returns the next vlan id in the list for this vpath.
> - * see also: vxge_hw_vpath_vid_get
> - *
> - */
> -enum vxge_hw_status
> -vxge_hw_vpath_vid_get_next(struct __vxge_hw_vpath_handle *vp, u64 *vid)
> -{
> - u64 data;
> - enum vxge_hw_status status = VXGE_HW_OK;
> -
> - if (vp == NULL) {
> - status = VXGE_HW_ERR_INVALID_HANDLE;
> - goto exit;
> - }
> -
> - status = __vxge_hw_vpath_rts_table_get(vp,
> - VXGE_HW_RTS_ACCESS_STEER_CTRL_ACTION_LIST_NEXT_ENTRY,
> - VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_VID,
> - 0, vid, &data);
> -
> - *vid = VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_VLAN_ID(*vid);
> -exit:
> - return status;
> -}
> -
> -/**
> * vxge_hw_vpath_vid_delete - Delete the vlan id entry for this vpath
> * to vlan id table.
> * @vp: Vpath handle.
> @@ -1898,9 +1875,9 @@ exit:
> * Process vpath alarms.
> *
> */
> -enum vxge_hw_status __vxge_hw_vpath_alarm_process(
> - struct __vxge_hw_virtualpath *vpath,
> - u32 skip_alarms)
> +static enum vxge_hw_status
> +__vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath,
> + u32 skip_alarms)
> {
> u64 val64;
> u64 alarm_status;
> @@ -2265,36 +2242,6 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw
> }
>
> /**
> - * vxge_hw_vpath_msix_clear - Clear MSIX Vector.
> - * @vp: Virtual Path handle.
> - * @msix_id: MSI ID
> - *
> - * The function clears the msix interrupt for the given msix_id
> - *
> - * Returns: 0,
> - * Otherwise, VXGE_HW_ERR_WRONG_IRQ if the msix index is out of range
> - * status.
> - * See also:
> - */
> -void
> -vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id)
> -{
> - struct __vxge_hw_device *hldev = vp->vpath->hldev;
> - if (hldev->config.intr_mode ==
> - VXGE_HW_INTR_MODE_MSIX_ONE_SHOT) {
> - __vxge_hw_pio_mem_write32_upper(
> - (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
> - &hldev->common_reg->
> - clr_msix_one_shot_vec[msix_id%4]);
> - } else {
> - __vxge_hw_pio_mem_write32_upper(
> - (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
> - &hldev->common_reg->
> - clear_msix_mask_vect[msix_id%4]);
> - }
> -}
> -
> -/**
> * vxge_hw_vpath_msix_unmask - Unmask the MSIX Vector.
> * @vp: Virtual Path handle.
> * @msix_id: MSI ID
> @@ -2316,22 +2263,6 @@ vxge_hw_vpath_msix_unmask(struct __vxge_
> }
>
> /**
> - * vxge_hw_vpath_msix_mask_all - Mask all MSIX vectors for the vpath.
> - * @vp: Virtual Path handle.
> - *
> - * The function masks all msix interrupt for the given vpath
> - *
> - */
> -void
> -vxge_hw_vpath_msix_mask_all(struct __vxge_hw_vpath_handle *vp)
> -{
> -
> - __vxge_hw_pio_mem_write32_upper(
> - (u32)vxge_bVALn(vxge_mBIT(vp->vpath->vp_id), 0, 32),
> - &vp->vpath->hldev->common_reg->set_msix_mask_all_vect);
> -}
> -
> -/**
> * vxge_hw_vpath_inta_mask_tx_rx - Mask Tx and Rx interrupts.
> * @vp: Virtual Path handle.
> *
> --- a/drivers/net/vxge/vxge-traffic.h 2010-10-15 09:10:06.834405939 -0700
> +++ b/drivers/net/vxge/vxge-traffic.h 2010-10-15 10:14:43.870258247 -0700
> @@ -1749,14 +1749,6 @@ vxge_hw_mrpcim_stats_access(
> u64 *stat);
>
> enum vxge_hw_status
> -vxge_hw_device_xmac_aggr_stats_get(struct __vxge_hw_device *devh, u32 port,
> - struct vxge_hw_xmac_aggr_stats *aggr_stats);
> -
> -enum vxge_hw_status
> -vxge_hw_device_xmac_port_stats_get(struct __vxge_hw_device *devh, u32 port,
> - struct vxge_hw_xmac_port_stats *port_stats);
> -
> -enum vxge_hw_status
> vxge_hw_device_xmac_stats_get(struct __vxge_hw_device *devh,
> struct vxge_hw_xmac_stats *xmac_stats);
>
> @@ -2117,49 +2109,10 @@ struct __vxge_hw_ring_rxd_priv {
> #endif
> };
>
> -/* ========================= RING PRIVATE API ============================= */
> -u64
> -__vxge_hw_ring_first_block_address_get(
> - struct __vxge_hw_ring *ringh);
> -
> -enum vxge_hw_status
> -__vxge_hw_ring_create(
> - struct __vxge_hw_vpath_handle *vpath_handle,
> - struct vxge_hw_ring_attr *attr);
> -
> -enum vxge_hw_status
> -__vxge_hw_ring_abort(
> - struct __vxge_hw_ring *ringh);
> -
> -enum vxge_hw_status
> -__vxge_hw_ring_reset(
> - struct __vxge_hw_ring *ringh);
> -
> -enum vxge_hw_status
> -__vxge_hw_ring_delete(
> - struct __vxge_hw_vpath_handle *vpath_handle);
> -
> /* ========================= FIFO PRIVATE API ============================= */
>
> struct vxge_hw_fifo_attr;
>
> -enum vxge_hw_status
> -__vxge_hw_fifo_create(
> - struct __vxge_hw_vpath_handle *vpath_handle,
> - struct vxge_hw_fifo_attr *attr);
> -
> -enum vxge_hw_status
> -__vxge_hw_fifo_abort(
> - struct __vxge_hw_fifo *fifoh);
> -
> -enum vxge_hw_status
> -__vxge_hw_fifo_reset(
> - struct __vxge_hw_fifo *ringh);
> -
> -enum vxge_hw_status
> -__vxge_hw_fifo_delete(
> - struct __vxge_hw_vpath_handle *vpath_handle);
> -
> struct vxge_hw_mempool_cbs {
> void (*item_func_alloc)(
> struct vxge_hw_mempool *mempoolh,
> @@ -2169,10 +2122,6 @@ struct vxge_hw_mempool_cbs {
> u32 is_last);
> };
>
> -void
> -__vxge_hw_mempool_destroy(
> - struct vxge_hw_mempool *mempool);
> -
> #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
> ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
>
> @@ -2195,61 +2144,10 @@ __vxge_hw_vpath_rts_table_set(
> u64 data2);
>
> enum vxge_hw_status
> -__vxge_hw_vpath_reset(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_sw_reset(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> __vxge_hw_vpath_enable(
> struct __vxge_hw_device *devh,
> u32 vp_id);
>
> -void
> -__vxge_hw_vpath_prc_configure(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_kdfc_configure(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_mac_configure(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_tim_configure(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_initialize(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vp_initialize(
> - struct __vxge_hw_device *devh,
> - u32 vp_id,
> - struct vxge_hw_vp_config *config);
> -
> -void
> -__vxge_hw_vp_terminate(
> - struct __vxge_hw_device *devh,
> - u32 vp_id);
> -
> -enum vxge_hw_status
> -__vxge_hw_vpath_alarm_process(
> - struct __vxge_hw_virtualpath *vpath,
> - u32 skip_alarms);
> -
> void vxge_hw_device_intr_enable(
> struct __vxge_hw_device *devh);
>
> @@ -2321,11 +2219,6 @@ vxge_hw_vpath_vid_get(
> u64 *vid);
>
> enum vxge_hw_status
> -vxge_hw_vpath_vid_get_next(
> - struct __vxge_hw_vpath_handle *vpath_handle,
> - u64 *vid);
> -
> -enum vxge_hw_status
> vxge_hw_vpath_vid_delete(
> struct __vxge_hw_vpath_handle *vpath_handle,
> u64 vid);
> @@ -2387,16 +2280,9 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw
> void vxge_hw_device_flush_io(struct __vxge_hw_device *devh);
>
> void
> -vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vpath_handle,
> - int msix_id);
> -
> -void
> vxge_hw_vpath_msix_unmask(struct __vxge_hw_vpath_handle *vpath_handle,
> int msix_id);
>
> -void
> -vxge_hw_vpath_msix_mask_all(struct __vxge_hw_vpath_handle *vpath_handle);
> -
> enum vxge_hw_status vxge_hw_vpath_intr_enable(
> struct __vxge_hw_vpath_handle *vpath_handle);
>
> @@ -2415,12 +2301,6 @@ vxge_hw_channel_msix_mask(struct __vxge_
> void
> vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channelh, int msix_id);
>
> -enum vxge_hw_status
> -vxge_hw_channel_dtr_alloc(struct __vxge_hw_channel *channel, void **dtrh);
> -
> -void
> -vxge_hw_channel_dtr_post(struct __vxge_hw_channel *channel, void *dtrh);
> -
> void
> vxge_hw_channel_dtr_try_complete(struct __vxge_hw_channel *channel,
> void **dtrh);
> @@ -2436,18 +2316,4 @@ vxge_hw_channel_dtr_count(struct __vxge_
> void
> vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id);
>
> -/* ========================== PRIVATE API ================================= */
> -
> -enum vxge_hw_status
> -__vxge_hw_device_handle_link_up_ind(struct __vxge_hw_device *hldev);
> -
> -enum vxge_hw_status
> -__vxge_hw_device_handle_link_down_ind(struct __vxge_hw_device *hldev);
> -
> -enum vxge_hw_status
> -__vxge_hw_device_handle_error(
> - struct __vxge_hw_device *hldev,
> - u32 vp_id,
> - enum vxge_hw_event type);
> -
> #endif
> --- a/drivers/net/vxge/vxge-ethtool.c 2010-10-15 09:10:06.718400615 -0700
> +++ b/drivers/net/vxge/vxge-ethtool.c 2010-10-15 10:13:39.927999492 -0700
> @@ -1142,7 +1142,7 @@ static const struct ethtool_ops vxge_eth
> .get_ethtool_stats = vxge_get_ethtool_stats,
> };
>
> -void initialize_ethtool_ops(struct net_device *ndev)
> +void vxge_initialize_ethtool_ops(struct net_device *ndev)
> {
> SET_ETHTOOL_OPS(ndev, &vxge_ethtool_ops);
> }
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] ethtool: add get permanent address option (v2)
From: Joe Perches @ 2010-10-18 20:16 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Ben Hutchings, Jeff Garzik, netdev
In-Reply-To: <20101018131104.02681d60@nehalam>
On Mon, 2010-10-18 at 13:11 -0700, Stephen Hemminger wrote:
> diff --git a/ethtool.c b/ethtool.c
[]
> @@ -750,7 +758,8 @@ static void parse_cmdline(int argc, char **argp)
> (mode == MODE_SNTUPLE) ||
> (mode == MODE_GNTUPLE) ||
> (mode == MODE_PHYS_ID) ||
> - (mode == MODE_FLASHDEV)) {
> + (mode == MODE_FLASHDEV) |
> + (mode == MODE_PERMADDR)) {
One more vertical bar please.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox