From: Stephen Hemminger <stephen@networkplumber•org>
To: Jay Vosburgh <fubar@us•ibm.com>,
Andy Gospodarek <andy@greyhouse•net>,
Veaceslav Falico <vfalico@redhat•com>,
David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH net-next 1/2] bonding: remove dead code
Date: Tue, 4 Mar 2014 16:34:25 -0800 [thread overview]
Message-ID: <20140304163425.44995c59@nehalam.linuxnetplumber.net> (raw)
These functions are defined but no longer used.
Compile tested only.
Signed-off-by: Stephen Hemminger <stephen@networkplumber•org>
--- a/drivers/net/bonding/bond_main.c 2014-03-03 10:37:53.188148575 -0800
+++ b/drivers/net/bonding/bond_main.c 2014-03-04 16:01:15.715286487 -0800
@@ -3931,52 +3931,6 @@ static void bond_uninit(struct net_devic
/*------------------------- Module initialization ---------------------------*/
-int bond_parm_tbl_lookup(int mode, const struct bond_parm_tbl *tbl)
-{
- int i;
-
- for (i = 0; tbl[i].modename; i++)
- if (mode == tbl[i].mode)
- return tbl[i].mode;
-
- return -1;
-}
-
-static int bond_parm_tbl_lookup_name(const char *modename,
- const struct bond_parm_tbl *tbl)
-{
- int i;
-
- for (i = 0; tbl[i].modename; i++)
- if (strcmp(modename, tbl[i].modename) == 0)
- return tbl[i].mode;
-
- return -1;
-}
-
-/*
- * Convert string input module parms. Accept either the
- * number of the mode or its string name. A bit complicated because
- * some mode names are substrings of other names, and calls from sysfs
- * may have whitespace in the name (trailing newlines, for example).
- */
-int bond_parse_parm(const char *buf, const struct bond_parm_tbl *tbl)
-{
- int modeint;
- char *p, modestr[BOND_MAX_MODENAME_LEN + 1];
-
- for (p = (char *)buf; *p; p++)
- if (!(isdigit(*p) || isspace(*p)))
- break;
-
- if (*p && sscanf(buf, "%20s", modestr) != 0)
- return bond_parm_tbl_lookup_name(modestr, tbl);
- else if (sscanf(buf, "%d", &modeint) != 0)
- return bond_parm_tbl_lookup(modeint, tbl);
-
- return -1;
-}
-
static int bond_check_params(struct bond_params *params)
{
int arp_validate_value, fail_over_mac_value, primary_reselect_value, i;
--- a/drivers/net/bonding/bonding.h 2014-03-03 10:37:53.188148575 -0800
+++ b/drivers/net/bonding/bonding.h 2014-03-04 16:01:09.003415653 -0800
@@ -458,8 +458,6 @@ void bond_sysfs_slave_del(struct slave *
int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);
int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);
int bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, int count);
-int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl);
-int bond_parm_tbl_lookup(int mode, const struct bond_parm_tbl *tbl);
void bond_select_active_slave(struct bonding *bond);
void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
void bond_create_debugfs(void);
next reply other threads:[~2014-03-05 0:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 0:34 Stephen Hemminger [this message]
2014-03-05 0:36 ` [PATCH net-next 2/2] bonding: options handling cleanup Stephen Hemminger
2014-03-05 11:39 ` Nikolay Aleksandrov
2014-03-06 21:09 ` David Miller
2014-03-05 1:34 ` [PATCH net-next 1/2] bonding: remove dead code Ding Tianhong
2014-03-06 21:09 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140304163425.44995c59@nehalam.linuxnetplumber.net \
--to=stephen@networkplumber$(echo .)org \
--cc=andy@greyhouse$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=fubar@us$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=vfalico@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox