commits December 2012

commits@lists.open-mesh.org

1 participants
24 discussions

[batctl] master: Merge branch 'next' (a395164)
by postmaster＠open-mesh.org 15 Dec '12

15 Dec '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit a3951645f11a48d55731eecf8b21defb2f5d5375 Merge: 2e962f1 1932d4e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Dec 15 16:21:49 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- a3951645f11a48d55731eecf8b21defb2f5d5375 bisect_iv.c | 34 ++++++++++++------------- debug.c | 36 +++++++++++++------------- debugfs.c | 2 +- functions.c | 18 ++++++------- ioctl.c | 10 ++++---- main.c | 68 +++++++++++++++++++++++++------------------------ ping.c | 30 +++++++++++----------- sys.c | 80 +++++++++++++++++++++++++++++----------------------------- tcpdump.c | 34 ++++++++++++------------- traceroute.c | 28 ++++++++++---------- translate.c | 2 +- vis.c | 8 +++--- 12 files changed, 176 insertions(+), 174 deletions(-) diff --cc sys.c index e4112b7,d7cc1c0..f628363 --- a/sys.c +++ b/sys.c @@@ -154,10 -153,9 +154,10 @@@ static int print_interfaces(char *mesh_ line_ptr = NULL; snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); + path_buff[PATH_BUFF_LEN - 1] = '\0'; res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { - printf("<error reading status>\n"); + fprintf(stderr, "<error reading status>\n"); continue; } @@@ -222,10 -219,9 +222,10 @@@ int interface(char *mesh_iface, int arg if (!file_exists(path_buff)) { snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]); + path_buff[PATH_BUFF_LEN - 1] = '\0'; if (!file_exists(path_buff)) { - printf("Error - interface does not exist: %s\n", argv[i]); + fprintf(stderr, "Error - interface does not exist: %s\n", argv[i]); continue; }

1 0

[batctl] master's head updated: Merge branch 'next' (a395164)
by postmaster＠open-mesh.org 15 Dec '12

15 Dec '12

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 2b80a87 batctl: output errors to stderr 1932d4e batctl: indicate successful termination when -h is used a395164 Merge branch 'next'

1 0

[batctl] next: batctl: indicate successful termination when -h is used (1932d4e)
by postmaster＠open-mesh.org 15 Dec '12

15 Dec '12

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 1932d4e4d9de997856209e9ef9013dbbdaa40848 Author: Moritz Warning <moritzwarning(a)web.de> Date: Wed Dec 5 09:40:10 2012 +0100 batctl: indicate successful termination when -h is used The return value of batctl -h indicates failure while it should indicate a successful execution. Signed-off-by: Moritz Warning <moritzwarning(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 1932d4e4d9de997856209e9ef9013dbbdaa40848 main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 0a979bd..ea83bbf 100644 --- a/main.c +++ b/main.c @@ -114,8 +114,10 @@ int main(int argc, char **argv) goto err; } - if (strcmp(argv[1], "-h") == 0) - goto err; + if (strcmp(argv[1], "-h") == 0) { + print_usage(); + exit(EXIT_SUCCESS); + } if (strcmp(argv[1], "-v") == 0) { printf("batctl %s [batman-adv: ", SOURCE_VERSION);

1 0

[batctl] next: batctl: output errors to stderr (2b80a87)
by postmaster＠open-mesh.org 15 Dec '12

15 Dec '12

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 2b80a875073774907752676638a98ab3c61376e6 Author: Moritz Warning <moritzwarning(a)web.de> Date: Wed Dec 5 09:36:09 2012 +0100 batctl: output errors to stderr batctl outputs many errors to stdout instead of stderr. This patch corrects this behavior by redirecting errors and the usage texts to stderr. Signed-off-by: Moritz Warning <moritzwarning(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 2b80a875073774907752676638a98ab3c61376e6 bisect_iv.c | 34 ++++++++++++------------- debug.c | 36 +++++++++++++------------- debugfs.c | 2 +- functions.c | 18 ++++++------- ioctl.c | 10 ++++---- main.c | 62 ++++++++++++++++++++++----------------------- ping.c | 30 +++++++++++----------- sys.c | 80 +++++++++++++++++++++++++++++----------------------------- tcpdump.c | 34 ++++++++++++------------- traceroute.c | 28 ++++++++++---------- translate.c | 2 +- vis.c | 8 +++--- 12 files changed, 172 insertions(+), 172 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index c4c06c2..dab00c5 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -37,15 +37,15 @@ static struct bat_node *curr_bat_node = NULL; static void bisect_iv_usage(void) { - printf("Usage: batctl bisect_iv [parameters] <file1> <file2> .. <fileN>\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -l run a loop detection of given mac address or bat-host (default)\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -o only display orig events that affect given mac address or bat-host\n"); - printf(" \t -r print routing tables of given mac address or bat-host\n"); - printf(" \t -s seqno range to limit the output\n"); - printf(" \t -t trace seqnos of given mac address or bat-host\n"); + fprintf(stderr, "Usage: batctl bisect_iv [parameters] <file1> <file2> .. <fileN>\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -l run a loop detection of given mac address or bat-host (default)\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -o only display orig events that affect given mac address or bat-host\n"); + fprintf(stderr, " \t -r print routing tables of given mac address or bat-host\n"); + fprintf(stderr, " \t -s seqno range to limit the output\n"); + fprintf(stderr, " \t -t trace seqnos of given mac address or bat-host\n"); } static int compare_name(void *data1, void *data2) @@ -1423,7 +1423,7 @@ static int get_orig_addr(char *orig_name, char *orig_addr) orig_mac = ether_aton(orig_name_tmp); if (!orig_mac) { - printf("Error - the originator is not a mac address or bat-host name: %s\n", orig_name); + fprintf(stderr, "Error - the originator is not a mac address or bat-host name: %s\n", orig_name); goto err; } @@ -1507,7 +1507,7 @@ int bisect_iv(int argc, char **argv) } if (argc <= found_args + 1) { - printf("Error - need at least 2 log files to compare\n"); + fprintf(stderr, "Error - need at least 2 log files to compare\n"); bisect_iv_usage(); goto err; } @@ -1515,7 +1515,7 @@ int bisect_iv(int argc, char **argv) node_hash = hash_new(64, compare_name, choose_name); if (!node_hash) { - printf("Error - could not create node hash table\n"); + fprintf(stderr, "Error - could not create node hash table\n"); goto err; } @@ -1523,13 +1523,13 @@ int bisect_iv(int argc, char **argv) num_parsed_files = 0; if ((rt_orig_ptr) && (trace_orig_ptr)) { - printf("Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (trace_orig_ptr)) { - printf("Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (rt_orig_ptr)) { - printf("Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); goto err; } else if (rt_orig_ptr) { res = get_orig_addr(rt_orig_ptr, orig); @@ -1553,7 +1553,7 @@ int bisect_iv(int argc, char **argv) seqno_max = seqno_min; if (seqno_min > seqno_max) { - printf("Error - the sequence range minimum (%lli) should be smaller than the maximum (%lli)\n", + fprintf(stderr, "Error - the sequence range minimum (%lli) should be smaller than the maximum (%lli)\n", seqno_min, seqno_max); goto err; } @@ -1575,7 +1575,7 @@ int bisect_iv(int argc, char **argv) } if (num_parsed_files < 2) { - printf("Error - need at least 2 log files to compare\n"); + fprintf(stderr, "Error - need at least 2 log files to compare\n"); goto err; } diff --git a/debug.c b/debug.c index 260448b..cdcbd39 100644 --- a/debug.c +++ b/debug.c @@ -80,16 +80,16 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { void debug_table_usage(int debug_table) { - printf("Usage: batctl [options] %s|%s [parameters]\n", + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]\n", batctl_debug_tables[debug_table].opt_long, batctl_debug_tables[debug_table].opt_short); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -H don't show the header\n"); - printf(" \t -w [interval] watch mode - refresh the table continuously\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); + fprintf(stderr, " \t -H don't show the header\n"); + fprintf(stderr, " \t -w [interval] watch mode - refresh the table continuously\n"); if (debug_table == BATCTL_TABLE_ORIGINATORS) - printf(" \t -t timeout interval - don't print originators not seen for x.y seconds \n"); + fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -117,20 +117,20 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) } if (!sscanf(optarg, "%f", &watch_interval)) { - printf("Error - provided argument of '-%c' is not a number\n", optchar); + fprintf(stderr, "Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; case 't': if (debug_table != BATCTL_TABLE_ORIGINATORS) { - printf("Error - unrecognised option '-%c'\n", optchar); + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(debug_table); return EXIT_FAILURE; } read_opt |= NO_OLD_ORIGS; if (!sscanf(optarg, "%f", &orig_timeout)) { - printf("Error - provided argument of '-%c' is not a number\n", optchar); + fprintf(stderr, "Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; @@ -139,14 +139,14 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) break; case '?': if (optopt == 't') - printf("Error - option '-t' needs a number as argument\n"); + fprintf(stderr, "Error - option '-t' needs a number as argument\n"); else if (optopt == 'w') { read_opt |= CLR_CONT_READ; break; } else - printf("Error - unrecognised option: '-%c'\n", optopt); + fprintf(stderr, "Error - unrecognised option: '-%c'\n", optopt); return EXIT_FAILURE; default: @@ -157,7 +157,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return EXIT_FAILURE; } @@ -169,10 +169,10 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) static void log_usage(void) { - printf("Usage: batctl [options] log [parameters]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); + fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); } int log_print(char *mesh_iface, int argc, char **argv) @@ -197,7 +197,7 @@ int log_print(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return EXIT_FAILURE; } diff --git a/debugfs.c b/debugfs.c index 549546c..3c2d834 100644 --- a/debugfs.c +++ b/debugfs.c @@ -84,7 +84,7 @@ const char *debugfs_find_mountpoint(void) /* give up and parse /proc/mounts */ fp = fopen("/proc/mounts", "r"); if (fp == NULL) { - printf("Error - can't open /proc/mounts for read: %s\n", + fprintf(stderr, "Error - can't open /proc/mounts for read: %s\n", strerror(errno)); return NULL; } diff --git a/functions.c b/functions.c index 57c2bba..516d29f 100644 --- a/functions.c +++ b/functions.c @@ -130,20 +130,20 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) if (strstr(dir, "/sys/")) { if (stat("/sys/", &st) != 0) { - printf("Error - the folder '/sys/' was not found on the system\n"); - printf("Please make sure that the sys filesystem is properly mounted\n"); + fprintf(stderr, "Error - the folder '/sys/' was not found on the system\n"); + fprintf(stderr, "Please make sure that the sys filesystem is properly mounted\n"); return; } } if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); return; } if (!file_exists(dir)) { - printf("Error - mesh has not been enabled yet\n"); - printf("Activate your mesh by adding interfaces to batman-adv\n"); + fprintf(stderr, "Error - mesh has not been enabled yet\n"); + fprintf(stderr, "Activate your mesh by adding interfaces to batman-adv\n"); return; } @@ -154,10 +154,10 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) break; } - printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); + fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, strerror(errno)); if (*ptr) { - printf("The option you called seems not to be compiled into your batman-adv kernel module.\n"); - printf("Consult the README if you wish to learn more about compiling options into batman-adv.\n"); + fprintf(stderr, "The option you called seems not to be compiled into your batman-adv kernel module.\n"); + fprintf(stderr, "Consult the README if you wish to learn more about compiling options into batman-adv.\n"); } } @@ -318,7 +318,7 @@ int write_file(char *dir, char *fname, char *arg1, char *arg2) write_len = write(fd, arg1, strlen(arg1) + 1); if (write_len < 0) { - printf("Error - can't write to file '%s': %s\n", full_path, strerror(errno)); + fprintf(stderr, "Error - can't write to file '%s': %s\n", full_path, strerror(errno)); goto out; } diff --git a/ioctl.c b/ioctl.c index 5056d2f..4347c20 100644 --- a/ioctl.c +++ b/ioctl.c @@ -50,7 +50,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t)&drvinfo; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't open driver information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't open driver information: %s\n", strerror(errno)); goto out; } @@ -64,7 +64,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings)); stats = calloc(1, sz_stats + sizeof(struct ethtool_stats)); if (!strings || !stats) { - printf("Error - out of memory\n"); + fprintf(stderr, "Error - out of memory\n"); goto out; } @@ -74,7 +74,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t)strings; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't get stats strings information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't get stats strings information: %s\n", strerror(errno)); goto out; } @@ -83,7 +83,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr) ifr->ifr_data = (caddr_t) stats; err = ioctl(fd, SIOCETHTOOL, ifr); if (err < 0) { - printf("Error - can't get stats information: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't get stats information: %s\n", strerror(errno)); goto out; } @@ -111,7 +111,7 @@ int ioctl_statistics_get(char *mesh_iface) fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) { - printf("Error - can't open socket: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't open socket: %s\n", strerror(errno)); goto out; } diff --git a/main.c b/main.c index 5d85d8b..0a979bd 100644 --- a/main.c +++ b/main.c @@ -48,47 +48,47 @@ void print_usage(void) { int i, opt_indent; - printf("Usage: batctl [options] command|debug table [parameters]\n"); - printf("options:\n"); - printf(" \t-m mesh interface (default 'bat0')\n"); - printf(" \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); - printf(" \t-v print version\n"); - printf("\n"); - - printf("commands:\n"); - printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); + fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t-m mesh interface (default 'bat0')\n"); + fprintf(stderr, " \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); + fprintf(stderr, " \t-v print version\n"); + fprintf(stderr, "\n"); + + fprintf(stderr, "commands:\n"); + fprintf(stderr, " \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { - printf(" \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); + fprintf(stderr, " \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); opt_indent = strlen(batctl_settings[i].opt_long) + strlen(batctl_settings[i].opt_short); if (batctl_settings[i].params == sysfs_param_enable) - printf("%*s display or modify %s setting\n", + fprintf(stderr, "%*s display or modify %s setting\n", 31 - opt_indent, "[0|1]", batctl_settings[i].opt_long); else if (batctl_settings[i].params == sysfs_param_server) - printf("%*s display or modify %s setting\n", + fprintf(stderr, "%*s display or modify %s setting\n", 41 - opt_indent, "[client|server]", batctl_settings[i].opt_long); else - printf(" display or modify %s setting\n", + fprintf(stderr, " display or modify %s setting\n", batctl_settings[i].opt_long); } - printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); - printf(" \tlog|l \tread the log produced by the kernel module\n"); - printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); - printf("\n"); + fprintf(stderr, " \tloglevel|ll [level] \tdisplay or modify the log level\n"); + fprintf(stderr, " \tlog|l \tread the log produced by the kernel module\n"); + fprintf(stderr, " \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); + fprintf(stderr, " \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); + fprintf(stderr, "\n"); - printf("debug tables: \tdisplay the corresponding debug table\n"); + fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); for (i = 0; i < BATCTL_TABLE_NUM; i++) - printf(" \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); - - printf("\n"); - printf(" \tstatistics|s \tprint mesh statistics\n"); - printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); - printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); - printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); + fprintf(stderr, " \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); + + fprintf(stderr, "\n"); + fprintf(stderr, " \tstatistics|s \tprint mesh statistics\n"); + fprintf(stderr, " \tping|p <destination> \tping another batman adv host via layer 2\n"); + fprintf(stderr, " \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); + fprintf(stderr, " \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + fprintf(stderr, " \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); #ifdef BATCTL_BISECT - printf(" \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); + fprintf(stderr, " \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); #endif } @@ -99,7 +99,7 @@ int main(int argc, char **argv) if ((argc > 1) && (strcmp(argv[1], "-m") == 0)) { if (argc < 3) { - printf("Error - the option '-m' needs a parameter\n"); + fprintf(stderr, "Error - the option '-m' needs a parameter\n"); goto err; } @@ -110,7 +110,7 @@ int main(int argc, char **argv) } if (argc < 2) { - printf("Error - no command specified\n"); + fprintf(stderr, "Error - no command specified\n"); goto err; } @@ -206,7 +206,7 @@ int main(int argc, char **argv) goto out; } - printf("Error - no valid command or debug table specified: %s\n", argv[1]); + fprintf(stderr, "Error - no valid command or debug table specified: %s\n", argv[1]); print_usage(); } diff --git a/ping.c b/ping.c index 51d18e8..4f52c66 100644 --- a/ping.c +++ b/ping.c @@ -44,14 +44,14 @@ char is_aborted = 0; void ping_usage(void) { - printf("Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); - printf("parameters:\n"); - printf(" \t -c ping packet count \n"); - printf(" \t -h print this help\n"); - printf(" \t -i interval in seconds\n"); - printf(" \t -t timeout in seconds\n"); - printf(" \t -R record route\n"); - printf(" \t -T don't try to translate mac to originator address\n"); + fprintf(stderr, "Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -c ping packet count \n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -i interval in seconds\n"); + fprintf(stderr, " \t -t timeout in seconds\n"); + fprintf(stderr, " \t -R record route\n"); + fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } void sig_handler(int sig) @@ -124,7 +124,7 @@ int ping(char *mesh_iface, int argc, char **argv) } if (argc <= found_args) { - printf("Error - target mac address or bat-host name not specified\n"); + fprintf(stderr, "Error - target mac address or bat-host name not specified\n"); ping_usage(); return EXIT_FAILURE; } @@ -140,7 +140,7 @@ int ping(char *mesh_iface, int argc, char **argv) dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } @@ -154,7 +154,7 @@ int ping(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); goto out; } @@ -163,7 +163,7 @@ int ping(char *mesh_iface, int argc, char **argv) ping_fd = open(icmp_socket, O_RDWR); if (ping_fd < 0) { - printf("Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", + fprintf(stderr, "Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", icmp_socket, strerror(errno)); printf("Check whether the module is loaded and active.\n"); goto out; @@ -203,7 +203,7 @@ int ping(char *mesh_iface, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); if (write(ping_fd, (char *)&icmp_packet_out, packet_len) < 0) { - printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); goto sleep; } @@ -231,7 +231,7 @@ read_packet: read_len = read(ping_fd, (char *)&icmp_packet_in, packet_len); if (read_len < 0) { - printf("Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); goto sleep; } @@ -298,7 +298,7 @@ read_packet: printf("From %s: Time to live exceeded (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case BATADV_PARAMETER_PROBLEM: - printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", + fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", icmp_packet_in.header.version, BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; diff --git a/sys.c b/sys.c index 9591416..d7cc1c0 100644 --- a/sys.c +++ b/sys.c @@ -103,9 +103,9 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { static void interface_usage(void) { - printf("Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); } static int print_interfaces(char *mesh_iface) @@ -116,21 +116,21 @@ static int print_interfaces(char *mesh_iface) int res; if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); goto err; } path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - printf("Error - could not allocate path buffer: out of memory ?\n"); + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); goto err; } iface_base_dir = opendir(SYS_IFACE_PATH); if (!iface_base_dir) { - printf("Error - the directory '%s' could not be read: %s\n", + fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", SYS_IFACE_PATH, strerror(errno)); - printf("Is the batman-adv module loaded and sysfs mounted ?\n"); + fprintf(stderr, "Is the batman-adv module loaded and sysfs mounted ?\n"); goto err_buff; } @@ -155,7 +155,7 @@ static int print_interfaces(char *mesh_iface) snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { - printf("<error reading status>\n"); + fprintf(stderr, "<error reading status>\n"); continue; } @@ -197,20 +197,20 @@ int interface(char *mesh_iface, int argc, char **argv) if ((strcmp(argv[1], "add") != 0) && (strcmp(argv[1], "a") != 0) && (strcmp(argv[1], "del") != 0) && (strcmp(argv[1], "d") != 0)) { - printf("Error - unknown argument specified: %s\n", argv[1]); + fprintf(stderr, "Error - unknown argument specified: %s\n", argv[1]); interface_usage(); goto err; } if (argc == 2) { - printf("Error - missing interface name(s) after '%s'\n", argv[1]); + fprintf(stderr, "Error - missing interface name(s) after '%s'\n", argv[1]); interface_usage(); goto err; } path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { - printf("Error - could not allocate path buffer: out of memory ?\n"); + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); goto err; } @@ -221,16 +221,16 @@ int interface(char *mesh_iface, int argc, char **argv) snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]); if (!file_exists(path_buff)) { - printf("Error - interface does not exist: %s\n", argv[i]); + fprintf(stderr, "Error - interface does not exist: %s\n", argv[i]); continue; } if (!file_exists(module_ver_path)) { - printf("Error - batman-adv module has not been loaded\n"); + fprintf(stderr, "Error - batman-adv module has not been loaded\n"); goto err; } - printf("Error - interface type not supported by batman-adv: %s\n", argv[i]); + fprintf(stderr, "Error - interface type not supported by batman-adv: %s\n", argv[i]); continue; } @@ -254,17 +254,17 @@ err: static void log_level_usage(void) { - printf("Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf("levels:\n"); - printf(" \t none Debug logging is disabled\n"); - printf(" \t all Print messages from all below\n"); - printf(" \t batman Messages related to routing / flooding / broadcasting\n"); - printf(" \t routes Messages related to route added / changed / deleted\n"); - printf(" \t tt Messages related to translation table operations\n"); - printf(" \t bla Messages related to bridge loop avoidance\n"); - printf(" \t dat Messages related to arp snooping and distributed arp table\n"); + fprintf(stderr, "Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, "levels:\n"); + fprintf(stderr, " \t none Debug logging is disabled\n"); + fprintf(stderr, " \t all Print messages from all below\n"); + fprintf(stderr, " \t batman Messages related to routing / flooding / broadcasting\n"); + fprintf(stderr, " \t routes Messages related to route added / changed / deleted\n"); + fprintf(stderr, " \t tt Messages related to translation table operations\n"); + fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); + fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -346,18 +346,18 @@ out: static void settings_usage(int setting) { - printf("Usage: batctl [options] %s|%s [parameters]", + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]", (char *)batctl_settings[setting].opt_long, (char *)batctl_settings[setting].opt_short); if (batctl_settings[setting].params == sysfs_param_enable) - printf(" [0|1]\n"); + fprintf(stderr, " [0|1]\n"); else if (batctl_settings[setting].params == sysfs_param_server) - printf(" [client|server]\n"); + fprintf(stderr, " [client|server]\n"); else - printf("\n"); + fprintf(stderr, "\n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); } int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) @@ -397,12 +397,12 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) ptr++; } - printf("Error - the supplied argument is invalid: %s\n", argv[1]); - printf("The following values are allowed:\n"); + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); ptr = batctl_settings[setting].params; while (*ptr) { - printf(" * %s\n", *ptr); + fprintf(stderr, " * %s\n", *ptr); ptr++; } @@ -419,9 +419,9 @@ out: static void gw_mode_usage(void) { - printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); - printf("options:\n"); - printf(" \t -h print this help\n"); + fprintf(stderr, "Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t -h print this help\n"); } int handle_gw_setting(char *mesh_iface, int argc, char **argv) @@ -525,12 +525,12 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) goto out; opt_err: - printf("Error - the supplied argument is invalid: %s\n", argv[1]); - printf("The following values are allowed:\n"); + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); ptr = sysfs_param_server; while (*ptr) { - printf(" * %s\n", *ptr); + fprintf(stderr, " * %s\n", *ptr); ptr++; } diff --git a/tcpdump.c b/tcpdump.c index 4424dfd..d9aa6a8 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -62,23 +62,23 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read static void tcpdump_usage(void) { - printf("Usage: batctl tcpdump [parameters] interface [interface]\n"); - printf("parameters:\n"); - printf(" \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); - printf(" \t -h print this help\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -p dump specific packet type\n"); - printf(" \t -x dump all packet types except specified\n"); - printf("packet types:\n"); - printf(" \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); - printf(" \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); - printf(" \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); - printf(" \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); - printf(" \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); - printf(" \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); - printf(" \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); - printf(" \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); - printf(" \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); + fprintf(stderr, "Usage: batctl tcpdump [parameters] interface [interface]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -p dump specific packet type\n"); + fprintf(stderr, " \t -x dump all packet types except specified\n"); + fprintf(stderr, "packet types:\n"); + fprintf(stderr, " \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); + fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); + fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); + fprintf(stderr, " \t\t%3d - batman vis packets\n", DUMP_TYPE_BATVIS); + fprintf(stderr, " \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); + fprintf(stderr, " \t\t%3d - batman tt / roaming packets\n", DUMP_TYPE_BATTT); + fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); + fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } static int print_time(void) diff --git a/traceroute.c b/traceroute.c index ac2f1fa..9da9bf6 100644 --- a/traceroute.c +++ b/traceroute.c @@ -43,11 +43,11 @@ void traceroute_usage(void) { - printf("Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); - printf("parameters:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't convert addresses to bat-host names\n"); - printf(" \t -T don't try to translate mac to originator address\n"); + fprintf(stderr, "Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); + fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } int traceroute(char *mesh_iface, int argc, char **argv) @@ -86,7 +86,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) } if (argc <= found_args) { - printf("Error - target mac address or bat-host name not specified\n"); + fprintf(stderr, "Error - target mac address or bat-host name not specified\n"); traceroute_usage(); return EXIT_FAILURE; } @@ -102,7 +102,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } @@ -114,7 +114,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); goto out; } @@ -123,9 +123,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) trace_fd = open(icmp_socket, O_RDWR); if (trace_fd < 0) { - printf("Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", + fprintf(stderr, "Error - can't open a connection to the batman adv kernel module via the socket '%s': %s\n", icmp_socket, strerror(errno)); - printf("Check whether the module is loaded and active.\n"); + fprintf(stderr, "Check whether the module is loaded and active.\n"); goto out; } @@ -148,7 +148,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) time_delta[i] = 0.0; if (write(trace_fd, (char *)&icmp_packet_out, sizeof(icmp_packet_out)) < 0) { - printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); continue; } @@ -169,7 +169,7 @@ read_packet: read_len = read(trace_fd, (char *)&icmp_packet_in, sizeof(icmp_packet_in)); if (read_len < 0) { - printf("Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); + fprintf(stderr, "Error - can't read from batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); continue; } @@ -202,9 +202,9 @@ read_packet: printf("%s: Destination Host Unreachable\n", dst_string); goto out; case BATADV_PARAMETER_PROBLEM: - printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", + fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", icmp_packet_in.header.version, BATADV_COMPAT_VERSION); - printf("Please make sure to use compatible versions!\n"); + fprintf(stderr, "Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); diff --git a/translate.c b/translate.c index 2d6ede9..bf33e90 100644 --- a/translate.c +++ b/translate.c @@ -31,7 +31,7 @@ static void translate_usage(void) { - printf("Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); + fprintf(stderr, "Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); } int translate(char *mesh_iface, int argc, char **argv) diff --git a/vis.c b/vis.c index b040497..f42d85a 100644 --- a/vis.c +++ b/vis.c @@ -58,9 +58,9 @@ static bool with_names = true; static void usage(void) { - printf("batctl vis_data dot {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); - printf("or\n"); - printf("batctl vis_data json {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); + fprintf(stderr, "batctl vis_data dot {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); + fprintf(stderr, "or\n"); + fprintf(stderr, "batctl vis_data json {-h}{--no-TT|-T} {--no-2nd|-2} {--numbers|-n}\n"); } static void dot_print_tq(char *orig, char *from, const long tq) @@ -171,7 +171,7 @@ static FILE *open_vis(char *mesh_iface) debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) { - printf("Error - can't mount or find debugfs\n"); + fprintf(stderr, "Error - can't mount or find debugfs\n"); return NULL; }

1 0

[linux-merge]linux integration; annotated tag, v3.7, created. v3.7
by postmaster＠open-mesh.org 11 Dec '12

11 Dec '12

The annotated tag, v3.7 has been created at d4f28c153f820851f9c765ac9bc12dffe90accae (tag) tagging 29594404d7fe73cd80eaa4ee8c43dcc53970c60e (commit) replaces v3.7-rc8 tagged by Linus Torvalds on Mon Dec 10 19:31:01 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJQxqj1AAoJEHm+PkMAQRiG9MQH/j21UwP2QGpdpXbWAnFMjtlv uE/yCFhPoqR1QjjE6oRlO6MHFA41xGDbr5RQki9Ik2AfSYiastt4ZWYvtSJKVTCr O0Lj+Cdt/2qBkGiARHqVEBZ4S/l/cw4/EHPb5StFyu3ggnPPQhoPIP7oAmRn0+mh NNb5CEcJOLqIaJSteqMP71Q899ncbLayBnimYCaC2f6r00beqNXIqxSHipcPlUsf ehNxqCX+5z5Q788EL33EL8GpBcy4Ueevu6nvnuVI8qIEnBnrBVngsiaQ4Hti+2eK A//4DYoF2N1wLjQv7hFeiwMURQ16OlxXoc/Z66sv2QQRwPxOIQlxdhWuey4KebA= =7LYr -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/master, created. batman-adv-for-davem-261-g833ce9f
by postmaster＠open-mesh.org 05 Dec '12

05 Dec '12

The branch, batman-adv/master has been created at 833ce9f2e94811e8dbf2e8daf7b591fa172c8283 (commit) - Shortlog ------------------------------------------------------------ commit 833ce9f2e94811e8dbf2e8daf7b591fa172c8283 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 26 01:27:29 2012 +0100 batman-adv: don't compile the BLA switch if not requested When the Bridge Loop Avoidance component is not compiled-in, its boolean switch should be not compiled as well. This patch surrounds the switch with a proper ifdef. This behaviour was introduced by 9fd6b0615b5499b270d39a92b8790e206cf75833 ("batman-adv: add bridge loop avoidance compile option") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit fba55062b73448401692936aa71b5ae002cb6002 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 29 04:54:45 2012 +0100 batman-adv: don't print the last_seen time for bat0 TT local entry bat0 MAC address will never deleted from the local translation table, therefore printing its last_Seen time is useless and will also produce ugly output and eventually a variable overflow. This was introduced by 59cb0861498776c62bd17584c31f34477fa301a0 ("batman-adv: improve local translation table output") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit ae75c7bf72350895f2a2e98437203bf51c18dc9c Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 29 01:03:31 2012 +0100 batman-adv: remove useless NULL check debugfs_remove_recursive() checks whether its argument is not null on its own, therefore it is possible to remove the external check. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 39d7ef90f1c2b8e7e3e69893cb9139f902c0e616 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Dec 1 02:32:01 2012 +0100 batman-adv: remove useless blank lines before and after brackets Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 81a995db125ab11f49d4949a231b647516a3c1db Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Nov 10 11:00:32 2012 +0100 batman-adv: Initialize lockdep class keys for hashes Different hashes have the same class key key because they get initialised with the same one. For this reason lockdep can create false warning when they are used recursively. Re-initialise the key for each hash after the invocation to hash_new() to avoid this problem. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Tested-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 6d965dc17ef3ffbad91f95a3a0e9bc43d6310916 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 19 09:01:44 2012 +0100 batman-adv: remove useless assignment in tt_local_add() The flag field of the tt_local_entry->common structure in tt_local_add() is first assigned NO_FLAGS and then TT_CLIENT_NEW so nullifying the first operation. For this reason it is safe to remove the first assignment. This was introuduced by ("batman-adv: keep local table consistency for further TT_RESPONSE") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 4f4937cbb1bb013c36d38d03e76e2db1495bdd8b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 19 09:01:43 2012 +0100 batman-adv: unify and properly print hex values Values are printed in hexadecimal format in several points in the code, but they are not printed using the same format string. This patches unifies the format used for such numbers so that they look the same everywhere. Given the fact that all the variables printed as hexadecimal are 16 bit long, this is the chosen printing format: %#.4x Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 8b840b19ca406b3c78bad8b31c14e3d7f880da26 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 19 09:01:42 2012 +0100 batman-adv: print the CRC together with the translation tables To simplify debugging operations, it is better to print the related CRC together with the translation table (local CRC for the local table and global CRC for each entry in the global table) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 26471d4eb6b7009dbc0ed1fddda3d4e4c471daed Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 22:16:16 2012 +0100 batman-adv: improve local translation table output This patch adds a nice header to the local translation table and the last_seen time for each local entry Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 5d938eb47c96e2667ad17fe8f12ca1ab5121fff1 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 22:16:15 2012 +0100 batman-adv: reduce local TT entry timeout to 10 minutes The current timeout is set to one hour. However a client connected to the mesh network will always generate traffic. In the worst case it will send ARP requests every 4 or 5 minutes. On the other hand having a long timeout means storing dead entries for one hour leads to very big trans-tables containing useless clients. This patch reduces the timeout to 10 minutes Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 509ef8c0d56f86e392c32e103bdf4c62668fe0e7 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Wed Oct 17 15:07:35 2012 +0200 batman-adv: Do not add multicast MAC addresses to translation table The current translation table mechanism is not suitable for multicast addresses and we are currently flooding such frames anyway. Therefore this patch prevents multicast MAC addresses being added to the translation table. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> commit 781bb634e20a0636b8922686705a8675f3213a3f Author: Shan Wei <davidshan(a)tencent.com> Date: Tue Nov 13 09:53:26 2012 +0800 batman-adv: use per_cpu_add helper this_cpu_add is an atomic operation. and be more faster than per_cpu_ptr operation. Signed-off-by: Shan Wei <davidshan(a)tencent.com> Reviewed-by: Christoph Lameter <cl(a)linux.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> commit b1afce9538eef6239798ec54cead3c39d69724ca Author: David S. Miller <davem(a)davemloft.net> Date: Tue Dec 4 14:46:34 2012 -0500 ipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 193c1e478cc496844fcbef402a10976c95a634ff Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:01:49 2012 +0000 ip6mr: fix rtm_family of rtnl msg We talk about IPv6, hence the family is RTNL_FAMILY_IP6MR! rtnl_register() is already called with RTNL_FAMILY_IP6MR. The bug is here since the beginning of this function (commit 5b285cac3570). Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 4e66ae2ea371cf431283e2cb95480eb860432856 Author: Serge Hallyn <serge.hallyn(a)canonical.com> Date: Mon Dec 3 16:17:12 2012 +0000 net: dev_change_net_namespace: send a KOBJ_REMOVED/KOBJ_ADD When a new nic is created in namespace ns1, the kernel sends a KOBJ_ADD uevent to ns1. When the nic is moved to ns2, we only send a KOBJ_MOVE to ns2, and nothing to ns1. This patch changes that behavior so that when moving a nic from ns1 to ns2, we send a KOBJ_REMOVED to ns1 and KOBJ_ADD to ns2. (The KOBJ_MOVE is still sent to ns2). The effects of this can be seen when starting and stopping containers in an upstart based host. Lxc will create a pair of veth nics, the kernel sends KOBJ_ADD, and upstart starts network-instance jobs for each. When one nic is moved to the container, because no KOBJ_REMOVED event is received, the network-instance job for that veth never goes away. This was reported at https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1065589 With this patch the networ-instance jobs properly go away. The other oddness solved here is that if a nic is passed into a running upstart-based container, without this patch no network-instance job is started in the container. But when the container creates a new nic itself (ip link add new type veth) then network-interface jobs are created. With this patch, behavior comes in line with a regular host. v2: also send KOBJ_ADD to new netns. There will then be a _MOVE event from the device_rename() call, but that should be innocuous. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> Acked-by: "Eric W. Biederman" <ebiederm(a)xmission.com> Acked-by: Daniel Lezcano <daniel.lezcano(a)free.fr> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 008d845cf65c3153bbcfa2f1cb3369a99e12de02 Author: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Date: Mon Dec 3 19:05:13 2012 +0000 net: neterion: use for_each_pci_dev to simplify the code Use for_each_pci_dev to simplify the code. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 812e44dd1829488096929ff362f749ae04dc71a0 Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:41 2012 +0000 ip6mr: advertise new mfc entries via rtnl This patch allows to monitor mf6c activities via rtnetlink. To avoid parsing two times the mf6c oifs, we use maxvif to allocate the rtnl msg, thus we may allocate some superfluous space. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 8cd3ac9f9b7bd921d0a28fd3273160ee8891e698 Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:40 2012 +0000 ipmr: advertise new mfc entries via rtnl This patch allows to monitor mfc activities via rtnetlink. To avoid parsing two times the mfc oifs, we use maxvif to allocate the rtnl msg, thus we may allocate some superfluous space. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 1eb99af52c4bc705f4042f37f255975acfc738f2 Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:39 2012 +0000 ipmr/ip6mr: allow to get unresolved cache via netlink /proc/net/ip[6]_mr_cache allows to get all mfc entries, even if they are put in the unresolved list (mfc[6]_unres_queue). But only the table RT_TABLE_DEFAULT is displayed. This patch adds the parsing of the unresolved list when the dump is made via rtnetlink, hence each table can be checked. In IPv6, we set rtm_type in ip6mr_fill_mroute(), because in case of unresolved mfc __ip6mr_fill_mroute() will not set it. In IPv4, it is already done. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 9a68ac72a44ecb6d4dc4a7cadf45e1a2cd183885 Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:38 2012 +0000 ipmr/ip6mr: report origin of mfc entry into rtnl msg A mfc entry can be static or not (added via the mroute_sk socket). The patch reports MFC_STATIC flag into rtm_protocol by setting rtm_protocol to RTPROT_STATIC or RTPROT_MROUTED. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit adfa85e45dac616ff4f8bfceff1621ccafc0b1ff Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:37 2012 +0000 ipmr/ip6mr: advertise mfc stats via rtnetlink These statistics can be checked only via /proc/net/ip_mr_cache or SIOCGETSGCNT[_IN6] and thus only for the table RT_TABLE_DEFAULT. Advertising them via rtnetlink allows to get statistics for all cache entries, whatever the table is. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 70b386a0cc65041fb01aacf5d4b8d1fa49fc8ce9 Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:36 2012 +0000 ip6mr: use nla_nest_* helpers This patch removes the skb manipulations when nested attributes are added by using standard helpers. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit d67b8c616b48df30e2836d797795f2420d109bc9 Author: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Date: Tue Dec 4 01:13:35 2012 +0000 netconf: advertise mc_forwarding status This patch advertise the MC_FORWARDING status for IPv4 and IPv6. This field is readonly, only multicast engine in the kernel updates it. Signed-off-by: Nicolas Dichtel <nicolas.dichtel(a)6wind.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit e8ad1a8fab6f550aba1f1fe7ba26749ff5460751 Merge: 099f7aa a0ecb85 Author: David S. Miller <davem(a)davemloft.net> Date: Tue Dec 4 13:01:19 2012 -0500 Merge branch 'master' of git://1984.lsi.us.es/nf-next Pablo Neira Ayuso says: ==================== * Remove limitation in the maximum number of supported sets in ipset. Now ipset automagically increments the number of slots in the array of sets by 64 new spare slots, from Jozsef Kadlecsik. * Partially remove the generic queue infrastructure now that ip_queue is gone. Its only client is nfnetlink_queue now, from Florian Westphal. * Add missing attribute policy checkings in ctnetlink, from Florian Westphal. * Automagically kill conntrack entries that use the wrong output interface for the masquerading case in case of routing changes, from Jozsef Kadlecsik. * Two patches two improve ct object traceability. Now ct objects are always placed in any of the existing lists. This allows us to dump the content of unconfirmed and dying conntracks via ctnetlink as a way to provide more instrumentation in case you suspect leaks, from myself. ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 099f7aa7400df0ffcc8d3c30dcde1ce0595d8a32 Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:58 2012 +0000 qlcnic: rename module params with module_param_named Add qlcnic prefix to qlcnic driver module parameters. Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 5796bd040e26915b05edf7b0e43eb4aa971170aa Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:57 2012 +0000 qlcnic: fix bug in LRO descriptor access macro Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit bff57d8e1de3510bb8845f639631b6fced211801 Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:56 2012 +0000 qlcnic: update NIC partition interface routines Refactor 82xx driver to support new adapter Update routines to support variable number of NIC partitions Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com> Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 229997989bdb7742cf5d21cdc6754017dab1e2db Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:55 2012 +0000 qlcnic: get board name API Cleanup get board information API. Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 15087c2b313b57feffcd92695c984a25e0e4eb90 Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:54 2012 +0000 qlcnic: modify PCI and register access routines Refactor 82xx driver to support new adapter Update PCI and hardware access routines Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com> Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 797884509d1f7dffa4fd1028a1f62a19705a518b Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:53 2012 +0000 qlcnic: move HW specific data to seperate structure Move HW specific data to a seperate structure as part of refactoring 82xx adapter driver. Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com> Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 97ee45eb099a9a0f1dc992f98e9476cc159ee5e0 Author: Sony Chacko <sony.chacko(a)qlogic.com> Date: Tue Dec 4 03:33:52 2012 +0000 qlcnic: add 82xx adapter specific checks Add 82xx adapter ID check before 82xx specific operations as part of refactoring the driver to enable support for new adapter. Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit fb4ce8ad8036e6b3d5ab021fd10934b80270cc11 Author: Matt Carlson <mcarlson(a)broadcom.com> Date: Mon Dec 3 19:37:00 2012 +0000 tg3: PTP - Enable the timestamping feature in hardware and fill skb tx/rx timestamps This patch implements the hardware timestamping as described in Documentation/networking/timestamping.txt Update version to 3.128. Signed-off-by: Nithin Nayak Sujir <nsujir(a)broadcom.com> Signed-off-by: Michael Chan <mchan(a)broadcom.com> Cc: Richard Cochran <richardcochran(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 0a633ac2284a92f0c65972bd8019146ed7d66159 Author: Matt Carlson <mcarlson(a)broadcom.com> Date: Mon Dec 3 19:36:59 2012 +0000 tg3: PTP - Add the hardware timestamp ioctl This patch implements the SIOCSHWTSTAMP ioctl as described in Documentation/networking/timestamping.txt [Removed HWTSTAMP_FILTER_ALL handling by returning -ERANGE based on input from Richard Cochran.] Signed-off-by: Nithin Nayak Sujir <nsujir(a)broadcom.com> Signed-off-by: Michael Chan <mchan(a)broadcom.com> Cc: Richard Cochran <richardcochran(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 7d41e49ac2a10a269bb50b4b019d75eed16fd55d Author: Matt Carlson <mcarlson(a)broadcom.com> Date: Mon Dec 3 19:36:58 2012 +0000 tg3: PTP - Implement the ptp api and ethtool functions This patch adds the ptp_caps structure, ptp api implementation, reference clock read and register/unregister functions. All the basic clock operations as described in Documentation/ptp/ptp.txt are supported. Frequency adjustment is performed using hardware with a 24 bit accumulator and a programmable correction value. On each clk, the correction value gets added to the accumulator and when it overflows, the time counter is incremented/decremented and the accumulator reset. So conversion from ppb to correction value is ppb * (1 << 24) / 1000000000 [Re-organized to put the ptp_clock_info struct declaration in one patch, added ptp_clock_info.name, and added locking to tg3_ptp_adjtime() based on input from Richard Cochran.] Signed-off-by: Nithin Nayak Sujir <nsujir(a)broadcom.com> Signed-off-by: Michael Chan <mchan(a)broadcom.com> Cc: Richard Cochran <richardcochran(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit be947307b5b61fabbd76194d02617f9d2653176d Author: Matt Carlson <mcarlson(a)broadcom.com> Date: Mon Dec 3 19:36:57 2012 +0000 tg3: PTP - Add header definitions, initialization and hw access functions. This patch adds code to write the reference clock. If a chip reset is performed, the hwclock is reinitialized with the adjusted kernel time Signed-off-by: Nithin Nayak Sujir <nsujir(a)broadcom.com> Signed-off-by: Michael Chan <mchan(a)broadcom.com> Cc: Richard Cochran <richardcochran(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 357630668a638418d542d0e331c90c01a091a3f1 Author: Nithin Nayak Sujir <nsujir(a)broadcom.com> Date: Mon Dec 3 19:36:56 2012 +0000 tg3: Fix inconsistent locking for tg3_netif_start(). Every caller holds tp->lock when calling tg3_netif_start() except tg3_io_resume(). Fix it so that it is all consistent. The subsequent PTP patches add tg3_ptp_resume() to tg3_netif_start() and the tp->lock is required. Signed-off-by: Nithin Nayak Sujir <nsujir(a)broadcom.com> Signed-off-by: Michael Chan <mchan(a)broadcom.com> Acked-by: Richard Cochran <richardcochran(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 682d7978aee072f411fc747d32954a8371dd7b1b Merge: a5a81f0 9f9a12f Author: David S. Miller <davem(a)davemloft.net> Date: Mon Dec 3 15:35:28 2012 -0500 Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next Networking: Remove __dev* markings from the networking drivers This is a series of patches that remove the dev* attributes for all networking drivers, with the exception of wireless drivers, those are in a different branch. Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit are no longer needed since CONFIG_HOTPLUG is being removed as an option. Note, there are some devinit compiler section mismatch warnings due to this series, but they are fixed up when merged with my driver-next branch, which fixes the PCI device id warnings, and removes the modpost detection, as it's no longer needed. Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit a5a81f0b9025867efb999d14a8dfc1907c5a4c3b Author: Paul Marks <pmarks(a)google.com> Date: Mon Dec 3 10:26:54 2012 +0000 ipv6: Fix default route failover when CONFIG_IPV6_ROUTER_PREF=n I believe this commit from 2008 was incorrect: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h… When CONFIG_IPV6_ROUTER_PREF is disabled, the kernel should follow RFC4861 section 6.3.6: if no route is NUD_VALID, then traffic should be sprayed across all routers (indirectly triggering NUD) until one of them becomes NUD_VALID. However, the following experiment demonstrates that this does not work: 1) Connect to an IPv6 network. 2) Change the router's MAC (and link-local) address. The kernel will lock onto the first router and never try the new one, even if the first becomes unreachable. This patch fixes the problem by allowing rt6_check_neigh() to return 0; if all routers return 0, then rt6_select() will fall back to round-robin behavior. This patch should have no effect when CONFIG_IPV6_ROUTER_PREF=y. Note that rt6_check_neigh() is only used in a boolean context, so I've changed its return type accordingly. Signed-off-by: Paul Marks <pmarks(a)google.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 5d097109257c03a71845729f8db6b5770c4bbedc Author: Michael S. Tsirkin <mst(a)redhat.com> Date: Mon Dec 3 10:07:14 2012 +0000 tun: only queue packets on device Historically tun supported two modes of operation: - in default mode, a small number of packets would get queued at the device, the rest would be queued in qdisc - in one queue mode, all packets would get queued at the device This might have made sense up to a point where we made the queue depth for both modes the same and set it to a huge value (500) so unless the consumer is stuck the chance of losing packets is small. Thus in practice both modes behave the same, but the default mode has some problems: - if packets are never consumed, fragments are never orphaned which cases a DOS for sender using zero copy transmit - overrun errors are hard to diagnose: fifo error is incremented only once so you can not distinguish between userspace that is stuck and a transient failure, tcpdump on the device does not show any traffic Userspace solves this simply by enabling IFF_ONE_QUEUE but there seems to be little point in not doing the right thing for everyone, by default. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 9f9a12f8ca79839c948464a37c5b557808278708 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:25 2012 -0500 net/intel: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> Cc: Jesse Brandeburg <jesse.brandeburg(a)intel.com> Cc: Bruce Allan <bruce.w.allan(a)intel.com> Cc: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Cc: Don Skidmore <donald.c.skidmore(a)intel.com> Cc: Greg Rose <gregory.v.rose(a)intel.com> Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr(a)intel.com> Cc: Alex Duyck <alexander.h.duyck(a)intel.com> Cc: John Ronciak <john.ronciak(a)intel.com> Cc: Tushar Dave <tushar.n.dave(a)intel.com> Cc: e1000-devel(a)lists.sourceforge.net Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 0329aba13791ec256dacdfdc74eca8673f6dd2e8 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:24 2012 -0500 bnx2x: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 047fc56614f8f8d03fb64ef3be44f040aad25d56 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:23 2012 -0500 net/broadcom: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 8e0e46bb3224057fd65f3041977163b6ee13346d Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:22 2012 -0500 xen-netfront: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> Cc: Jeremy Fitzhardinge <jeremy(a)goop.org> Cc: xen-devel(a)lists.xensource.com Cc: virtualization(a)lists.linux-foundation.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit a46182eb9a9b0801776d5b6eca7591774cdea7a8 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:21 2012 -0500 net/lmc: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit da3f21b5f997e361a3251e757a10574984593c14 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:20 2012 -0500 ixp4xx_hss: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Krzysztof Halasa <khc(a)pm.waw.pl> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit aeea6bbfa3f185dcd6f812ece8bed778ec0da3be Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:19 2012 -0500 net/hdlc: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Krzysztof Halasa <khc(a)pm.waw.pl> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 5a37931ff0be06b4c774aa604f86ed4566a0ede7 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:18 2012 -0500 farsync: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Kevin Curtis <kevin.curtis(a)farsite.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 6ad888c679ff7b4143e8a89706a5c097004b168a Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:17 2012 -0500 dscc4: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Francois Romieu <romieu(a)fr.zoreil.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 3a4751a3bb2704ca382e22a07648a5c255d6916d Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:16 2012 -0500 vmxnet3: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Shreyas Bhatewara <sbhatewara(a)vmware.com> Cc: VMware, Inc. <pv-drivers(a)vmware.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 8cc085d604f7f2f1be68d0b50db1dfd5640266b7 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:15 2012 -0500 virtio_net: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Rusty Russell <rusty(a)rustcorp.com.au> Cc: Michael S. Tsirkin <mst(a)redhat.com> Cc: virtualization(a)lists.linux-foundation.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 633d1594974b33a673a9eaf141d557e176202d8f Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:14 2012 -0500 net/phy: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 45ac936c3ec93f347cfb7652bd7b332dc0c9b2e8 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:13 2012 -0500 irda: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Samuel Ortiz <samuel(a)sortiz.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit bb1f4606754c45bbb467c15aa5fec84228f73e47 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:12 2012 -0500 ieee802154: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 6e9454913e9b0e7b02377ee102348dd8e9681f44 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:11 2012 -0500 hippi: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jes Sorensen <jes(a)trained-monkey.org> Cc: linux-hippi(a)sunsite.dk Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit c354dfc3f222ec895411a8297d929ff666cbc153 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:10 2012 -0500 fddi: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Maciej W. Rozycki <macro(a)linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit a0a4efedf9dea0f2dd9625181b48c1f8c6d5418e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:09 2012 -0500 net/ethernet: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 06b0e68327d499c3588c954d2a2d86458d451c4b Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:08 2012 -0500 net/xilinx: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 0e1effe39a5973888bed03db3a4998c4b8ba333a Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:07 2012 -0500 net/wiznet: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit fe4a57c581f88e81e9274e0750f1a22c8c73cf58 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:06 2012 -0500 net/ps3_gelic_wireless: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 671a1435b4e04aa7fadca6e19d39cbc2d0617319 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:05 2012 -0500 net/spider_net: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Ishizaki Kou <kou.ishizaki(a)toshiba.co.jp> Cc: Jens Osterkamp <jens(a)de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 14d4171de914859ea34cc820d1548c5063b8aaf4 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:04 2012 -0500 net/ps3_gelic_net: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Geoff Levand <geoff(a)infradead.org> Cc: cbe-oss-dev(a)lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit e38921d4dd7d2f052c1c2344fac307463c3b8d2d Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:03 2012 -0500 net/davinci_emac: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit f73d12bd298f9614d8600326e9bd1f7871fcde4b Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:02 2012 -0500 net/sun: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit f48a3c2af87960e3d497b518a3253337a18016db Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:01 2012 -0500 net/sgi: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 03c4d832a2a752120d18567c27812d53ab176e6e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:24:00 2012 -0500 net/pasemi: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Olof Johansson <olof(a)lixom.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 654b8c5ce3b32403a915dfd41d92ad3118c3406e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:59 2012 -0500 net/micrel: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 33897cc869eef8b878b2408f77b7b0387e43e74e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:58 2012 -0500 net/freescale: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 37a5b3d5315ab8c354ec147e26b3870dd5c93813 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:57 2012 -0500 net/cadence: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Nicolas Ferre <nicolas.ferre(a)atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 093d369d4e8e8b6361317edd83935bdf8a0c83de Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:56 2012 -0500 net/atheros: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jay Cliburn <jcliburn(a)gmail.com> Cc: Chris Snook <chris.snook(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 97c71ad4cef8bf9af36d2c495a971e149a9b77c8 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:55 2012 -0500 net/apple: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 0cb0568dfea6b51a39362c484c9caddfc94a78b0 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:54 2012 -0500 net/amd: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit af37557b1b222c64e005c105c81aa3888128bb5d Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:53 2012 -0500 jme: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Guo-Fu Tseng <cooldavid(a)cooldavid.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 331774760a65c27c673aa7735075124978e7994b Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:52 2012 -0500 icplus: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Francois Romieu <romieu(a)fr.zoreil.com> Cc: Sorbica Shieh <sorbica(a)icplus.com.tw> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 9871b639d00b75625a4bc855c09096e2c4897816 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:51 2012 -0500 ixp4xx_eth: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Krzysztof Halasa <khc(a)pm.waw.pl> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 48d16cb1befb39ab1d7dc5842182d6133d88de0e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:50 2012 -0500 xilinx_axienet: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Anirudha Sarangi <anirudh(a)xilinx.com> Cc: John Linn <John.Linn(a)xilinx.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 27add00620ed820f94c8d332591fe73ba384b7e9 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:49 2012 -0500 via-velocity: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Francois Romieu <romieu(a)fr.zoreil.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 76e239e1fa66eab1cb5b80a86d4803dc839bbc8f Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:48 2012 -0500 via-rhine: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Roger Luethi <rl(a)hellgate.ch> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit b38d13066020a5390b59d1b740b7985d548bfb5b Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:47 2012 -0500 tc35815: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 17abe3e4c67bfbf20e870be9c8b4634c12f73018 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:46 2012 -0500 tehuti: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Andy Gospodarek <andy(a)greyhouse.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 663e12e61d8764ce342588325d1050d9cb5460c0 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:45 2012 -0500 cpsw: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 369158767af29ed54f3751f80222e751cf60236c Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:44 2012 -0500 tlan: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Samuel Chessman <chessman(a)tux.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit f57ae66ee5486426fc86ed46f97c5e15792c8535 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:43 2012 -0500 cpmac: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Florian Fainelli <florian(a)openwrt.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit b0171cdc3702416274f05936ef63767d71c25065 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:42 2012 -0500 epic100: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 779c1a85813a4622cc3bb3d25ce10b523bd055ba Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:41 2012 -0500 tulip: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Grant Grundler <grundler(a)parisc-linux.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit f3f9e50927b6c4791bf81dacae8bf5e7832b535d Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:40 2012 -0500 smsc9420: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Steve Glendinning <steve.glendinning(a)shawell.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 9f1e13db5987c440a76c496d83c773c13afb557e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:39 2012 -0500 smc911x: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 8489ec1f97006495d9eb06a90f1ffcbfeb879aab Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:38 2012 -0500 smsc911x: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Steve Glendinning <steve.glendinning(a)shawell.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 1e48fea4805db6766708d9387f8dc1c5d5226263 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:37 2012 -0500 smc91x: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Nicolas Pitre <nico(a)fluxnic.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 369e12313dbf7a08fa9ed50c07edd4b5ad399251 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:36 2012 -0500 sis900: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Daniele Venzano <venza(a)brownhat.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit fe80f565d5007716c60d0a82497bed1d537a09a3 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:35 2012 -0500 sis190: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Francois Romieu <romieu(a)fr.zoreil.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 979857bbcfd493ce23f4865c7eb11c8853f065a4 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:34 2012 -0500 stmmac: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Giuseppe Cavallaro <peppe.cavallaro(a)st.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 58af79f06236164ce10e9b08aac12945496b4f5e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:33 2012 -0500 sc92031: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 87d1fc11303473a2bd74eedb8377ff80d853972b Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:32 2012 -0500 sfc: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Solarflare linux maintainers <linux-net-drivers(a)solarflare.com> Cc: Ben Hutchings <bhutchings(a)solarflare.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 5911ce0d99b37a902b2c85e172139ce76c8fc583 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:31 2012 -0500 seeq: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Russell King <linux(a)arm.linux.org.uk> Cc: linux-arm-kernel(a)lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit f1e242648bce83ec67f8bc047e1ad1ade7b85725 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:30 2012 -0500 r6040: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Florian Fainelli <florian(a)openwrt.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit b4e54a9442c741e09f7df92f1f62e282a9c3dd05 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:29 2012 -0500 8139too: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit baf63293532a0c23478c46df959ad11f93a0b904 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:28 2012 -0500 r8169: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Realtek linux nic maintainers <nic_swsd(a)realtek.com> Cc: Francois Romieu <romieu(a)fr.zoreil.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 5d8e87265715a109b3e3dc0829dc2dbcbf8b16ac Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:27 2012 -0500 qlge: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com> Cc: Ron Mercer <ron.mercer(a)qlogic.com> Cc: linux-driver(a)qlogic.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit e3a582feac18f586d1ba9ddb08d4f77719923bc9 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:26 2012 -0500 qla3xxx: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com> Cc: Ron Mercer <ron.mercer(a)qlogic.com> Cc: linux-driver(a)qlogic.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 6bb58bb0afa28bc573fb8240a4bc4e04890e3389 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:25 2012 -0500 qlcnic: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com> Cc: Sony Chacko <sony.chacko(a)qlogic.com> Cc: linux-driver(a)qlogic.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit c3f9c88c1ca2902bcadae7138d2b3de552205f64 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:24 2012 -0500 netxen: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Sony Chacko <sony.chacko(a)qlogic.com> Cc: Rajesh Borundia <rajesh.borundia(a)qlogic.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 134c1f154e1f9c0c7eddc9d5d13e110aed16b03e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:23 2012 -0500 packetengines: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 5bc7ec702fd7680eb12be88ada87742db9676f5c Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:22 2012 -0500 net/octeon_mgmt: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 21524526b3ec66329cba682f11fdba77c8b0e698 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:21 2012 -0500 lpc_eth: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit d05919a148154d6814cf98f515d477bf676e957e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:20 2012 -0500 forcedeth: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 26735f2f126f5d75234e205687e3c15e1a5a3684 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:19 2012 -0500 nuvoton: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Wan ZongShun <mcuos.com(a)gmail.com> Cc: linux-arm-kernel(a)lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 3a036ce5c6fdd787d3146c639871668996221c0d Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:18 2012 -0500 vxge/s2io: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jon Mason <jdmason(a)kudzu.us> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 6980cbe4a6dbb3d7871e99a3cbc74a572d14d327 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:17 2012 -0500 natsemi: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 19d1b44aa8eba6304abdfe9761bb941f38b512f5 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:16 2012 -0500 enc28j60: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit f57e68488e27fb99bda29eb0c42b5450e439aa87 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:15 2012 -0500 mlx4_core: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 853e3f4c5f49e51c904dab0d25eda82a92f1341f Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:14 2012 -0500 skge: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Mirko Lindner <mlindner(a)marvell.com> Cc: Stephen Hemminger <shemminger(a)vyatta.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit fe17dc1e2bae8599aa034e678f7bbfd1f98e5a15 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:13 2012 -0500 ibm/emac: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit e11787a2313c41a1f4469d797b2d9bc6fe0642b1 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:12 2012 -0500 ibmveth: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Santiago Leon <santil(a)linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 170b52b873ca0772a1ae2453258eeec825d9b8af Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:11 2012 -0500 hp100: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jaroslav Kysela <perex(a)perex.cz> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 0297be07091fc809f27a9f50e5130d41c9ac3f52 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:10 2012 -0500 ehea: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Thadeu Lima de Souza Cascardo <cascardo(a)linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 3bc6b06ce06039b981333e600f79963ae5a86dba Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:09 2012 -0500 be2net: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Sathya Perla <sathya.perla(a)emulex.com> Cc: Subbu Seetharaman <subbu.seetharaman(a)emulex.com> Cc: Ajit Khaparde <ajit.khaparde(a)emulex.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 4f2c53ea27a8d12aaf07f61b5d13d20cadfdefd0 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:08 2012 -0500 fs_enet: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Pantelis Antoniou <pantelis.antoniou(a)gmail.com> Cc: Vitaly Bordug <vbordug(a)ru.mvista.com> Cc: linuxppc-dev(a)lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 64bc40de134bb5c7826ff384016f654219ed3956 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:07 2012 -0500 dlink: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 6b6a3e7f65e5736030032b4d39901479ba437e5f Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:06 2012 -0500 dm9000: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 854de92f6d3471e694ea807a52b2670862b15d42 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:05 2012 -0500 enic: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Christian Benvenuti <benve(a)cisco.com> Cc: Roopa Prabhu <roprabhu(a)cisco.com> Cc: Neel Patel <neepatel(a)cisco.com> Cc: Nishank Trivedi <nistrive(a)cisco.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit ff76a3cca3a2f8664e0625cb4d75601ff9ccde76 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:04 2012 -0500 chelsio: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit d289f864601eb3678824ba3c0b15217af79171e0 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:03 2012 -0500 cxgb4vf: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Casey Leedom <leedom(a)chelsio.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 91744948659a5cf937a9094f50f09c412656ca4a Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:02 2012 -0500 cxgb4: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Dimitris Michailidis <dm(a)chelsio.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 2109eaab72cf95cbb2af51253b46a72e4f2180c9 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:01 2012 -0500 cxgb3: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Divy Le Ray <divy(a)chelsio.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit c4eef189aaef84612de3961b2681fbf794afca20 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:23:00 2012 -0500 bna: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Rasesh Mody <rmody(a)brocade.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 229b1ad1cb1a7159658f466c736bc3898dabb876 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:59 2012 -0500 tg3: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Matt Carlson <mcarlson(a)broadcom.com> Cc: Michael Chan <mchan(a)broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit cfd95a634f49358ab8d2a759c637fef0b50e7583 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:58 2012 -0500 bnx2: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Michael Chan <mchan(a)broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 239718871072b45370816cf272ea29c0d34b3d12 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:57 2012 -0500 b44: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Gary Zambrano <zambrano(a)broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit a9590879e12f920d8b2fc74c019b5d1604068862 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:56 2012 -0500 pcnet32: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Don Fry <pcnet32(a)frontier.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit c0c0e29d8c94fb483bf94a2157f1ef0a7fb70b55 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:55 2012 -0500 aeroflex: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Kristoffer Glembo <kristoffer(a)gaisler.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 49f7315b3ece7900cbe763da2af67928fbdf6d55 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:54 2012 -0500 bfin_mac: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: uclinux-dist-devel(a)blackfin.uclinux.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit d3ace588d8f55b526f03c7277c8cf08a87ea7ce7 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:53 2012 -0500 starfire: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Ion Badulescu <ionut(a)badula.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 083abbb7dc16b6b6955ef6f5299bdbff9877363f Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:52 2012 -0500 acenic: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Jes Sorensen <jes(a)trained-monkey.org> Cc: linux-acenic(a)sunsite.dk Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 4168ac0eb323fa1f886830a19b7f263643bc0cbd Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:51 2012 -0500 8390: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 2791cf7a73d4c0ab110bcf21b5c0575efbe934d0 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:50 2012 -0500 3c509: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 21cf689b16afa08fe8b02dfadaea88500d6c73c6 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:49 2012 -0500 typhoon: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: David Dillow <dave(a)thedillows.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 3f6db0f38f2a170b4d9d5a7e3c329ab7701cd0cb Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:48 2012 -0500 3c59x: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Steffen Klassert <klassert(a)mathematik.tu-chemnitz.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 58b10698d2d60b0b0c3bddd72038af14e62f92bc Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:47 2012 -0500 i825xx: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 663c2a69e943b391b3cea25c616e339c5d5d4fab Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:46 2012 -0500 i825xx/ether1.c: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Russell King <linux(a)arm.linux.org.uk> Cc: linux-arm-kernel(a)lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 92a66593e5e7ae60242c430abac7bd710d1c7da0 Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:45 2012 -0500 drivers/net/ethernet/amd/am79c961a.c: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Russell King <linux(a)arm.linux.org.uk> Cc: linux-arm-kernel(a)lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:44 2012 -0500 can: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Cc: Wolfgang Grandegger <wg(a)grandegger.com> Cc: Marc Kleine-Budde <mkl(a)pengutronix.de> Cc: linux-can(a)vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 7c47bab62192d4dd6ba7f7633f2fb94d259e964e Author: Bill Pemberton <wfp5p(a)virginia.edu> Date: Mon Dec 3 09:22:43 2012 -0500 ARCNET: remove __dev* attributes CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p(a)virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> commit 9ba2add3cf5c103b7236f82a023c8ee05a51e4d1 Author: Shmulik Ladkani <shmulik.ladkani(a)gmail.com> Date: Sun Dec 2 01:44:53 2012 +0000 ipv6: Make 'addrconf_rs_timer' send Router Solicitations (and re-arm itself) if Router Advertisements are accepted As of 026359b [ipv6: Send ICMPv6 RSes only when RAs are accepted], Router Solicitations are sent whenever kernel accepts Router Advertisements on the interface. However, this logic isn't reflected in 'addrconf_rs_timer'. The timer fails to issue subsequent RS messages (and fails to re-arm itself) if forwarding is enabled and the special hybrid mode is enabled (accept_ra=2). Fix the condition determining whether next RS should be sent, by using 'ipv6_accept_ra()'. Reported-by: Ami Koren <amikoren(a)yahoo.com> Signed-off-by: Shmulik Ladkani <shmulik.ladkani(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 1c85382e30618f66d4b15e608ff32253beb22649 Author: Lino Sanfilippo <LinoSanfilippo(a)gmx.de> Date: Sat Dec 1 02:39:28 2012 +0000 sky2: fix cleanup sequence in probe() function The cleanup sequence in sky2_probe() that is called in case of an error is mixed up in different places: - pci_disable_device() is not called in each case the device has been enabled before - same for pci_disable_msi(): test_msi() may return with an error != EOPNOTSUPP (due to failure of request_irq()). In that case msi is not disabled - also failure of register_netdev() does not disable msi This patch fixes the concerning parts. Signed-off-by: Lino Sanfilippo <LinoSanfilippo(a)gmx.de> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit cb64edb6b89491edfdbae52ba7db9a8b8391d339 Author: John Greene <jogreene(a)redhat.com> Date: Mon Dec 3 06:19:33 2012 +0000 8139cp: properly support change of MTU values [v2] The 8139cp driver has a change_mtu function that has not been enabled since the dawn of the git repository. However, the generic eth_change_mtu is not used in its place, so that invalid MTU values can be set on the interface. Original patch salvages the broken code for the single case of setting the MTU while the interface is down, which is safe and also includes the range check. Now enhanced to support up or down interface. v2: fix case where rxbufsz isn't changed in the up state case Original patch from http://lkml.indiana.edu/hypermail/linux/kernel/1202.2/00770.html Testing: has been test on virtual 8139cp setup without issue, have no access real hardware 8139cp, need testing help. Signed-off-by: "John Greene" <jogreene(a)redhat.com> CC: "David S. Miller" <davem(a)davemloft.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit eb0fb363f920e4d8c70d30b712f9dd433271218c Author: Jason Wang <jasowang(a)redhat.com> Date: Sun Dec 2 17:19:45 2012 +0000 tuntap: attach queue 0 before registering netdevice We attach queue 0 after registering netdevice currently. This leads to call netif_set_real_num_{tx|rx}_queues() after registering the netdevice. Since we allow tun/tap has a maximum of 1024 queues, this may lead a huge number of uevents to be injected to userspace since we create 2048 kobjects and then remove 2046. Solve this problem by attaching queue 0 and set the real number of queues before registering netdevice. Reported-by: Jiri Slaby <jslaby(a)suse.cz> Tested-by: Jiri Slaby <jslaby(a)suse.cz> Signed-off-by: Jason Wang <jasowang(a)redhat.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 092a5fc9636268bc2c0fef4d9b99845699cf19f9 Author: Yaniv Rosner <yaniv.rosner(a)broadcom.com> Date: Sun Dec 2 23:56:49 2012 +0000 bnx2x: recognize fan failure If fan failure is detected, MCP prevents PCI I/O registers from being mapped to the bar, causing a fatal error as driver is unaware. This patch recognizes such an event occurred and gracefully terminates the probe process. Signed-off-by: Yaniv Rosner <yaniv.rosner(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 64e9a9b8a0eef9cbd9f86f0e79fc4eeea24abe76 Author: Michael S. Tsirkin <mst(a)redhat.com> Date: Mon Dec 3 07:31:51 2012 +0000 vhost-net: initialize zcopy packet counters These packet counters are used to drive the zercopy selection heuristic so nothing too bad happens if they are off a bit - and they are also reset once in a while. But it's cleaner to clear them when backend is set so that we start in a known state. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 3e14bd390ebe41e8b83855fd85fb64478c7c5ee2 Author: walimis <walimisdev(a)gmail.com> Date: Mon Dec 3 02:19:44 2012 +0000 stmmac: remove two repeated macros Two macros have been defined twice, remove them. Signed-off-by: Liming Wang <walimisdev(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit f210e87b6d3aab1fb3eb51a006f4502c1a7a2494 Author: Denis Kirjanov <kda(a)linux-powerpc.org> Date: Sat Dec 1 08:39:19 2012 +0000 sundance: Enable WoL support Enable WoL support. Signed-off-by: Denis Kirjanov <kda(a)linux-powerpc.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 196d67593439b03088913227093e374235596e33 Author: Michele Baldessari <michele(a)acksyn.org> Date: Sat Dec 1 04:49:42 2012 +0000 sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call The current SCTP stack is lacking a mechanism to have per association statistics. This is an implementation modeled after OpenSolaris' SCTP_GET_ASSOC_STATS. Userspace part will follow on lksctp if/when there is a general ACK on this. V4: - Move ipackets++ before q->immediate.func() for consistency reasons - Move sctp_max_rto() at the end of sctp_transport_update_rto() to avoid returning bogus RTO values - return asoc->rto_min when max_obs_rto value has not changed V3: - Increase ictrlchunks in sctp_assoc_bh_rcv() as well - Move ipackets++ to sctp_inq_push() - return 0 when no rto updates took place since the last call V2: - Implement partial retrieval of stat struct to cope for future expansion - Kill the rtxpackets counter as it cannot be precise anyway - Rename outseqtsns to outofseqtsns to make it clearer that these are out of sequence unexpected TSNs - Move asoc->ipackets++ under a lock to avoid potential miscounts - Fold asoc->opackets++ into the already existing asoc check - Kill unneeded (q->asoc) test when increasing rtxchunks - Do not count octrlchunks if sending failed (SCTP_XMIT_OK != 0) - Don't count SHUTDOWNs as SACKs - Move SCTP_GET_ASSOC_STATS to the private space API - Adjust the len check in sctp_getsockopt_assoc_stats() to allow for future struct growth - Move association statistics in their own struct - Update idupchunks when we send a SACK with dup TSNs - return min_rto in max_rto when RTO has not changed. Also return the transport when max_rto last changed. Signed-off: Michele Baldessari <michele(a)acksyn.org> Acked-by: Vlad Yasevich <vyasevich(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 96070ae4d08eefe62ac534904ce21a01e1a5c9c4 Author: Alexander Shiyan <shc_work(a)mail.ru> Date: Sat Dec 1 01:07:26 2012 +0000 irda: ep7211-sir: Convert to platform_diver This patch converts ep7211-sir driver to platform_driver. Since driver can be used not only for EP7211 CPU, function names was be renamed to generic clps711x... Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> Acked-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit a0ecb85a2c3af73c63b6d44ce82aea52347ccf55 Author: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> Date: Fri Nov 30 12:37:26 2012 +0000 netfilter: nf_nat: Handle routing changes in MASQUERADE target When the route changes (backup default route, VPNs) which affect a masqueraded target, the packets were sent out with the outdated source address. The patch addresses the issue by comparing the outgoing interface directly with the masqueraded interface in the nat table. Events are inefficient in this case, because it'd require adding route events to the network core and then scanning the whole conntrack table and re-checking the route for all entry. Signed-off-by: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> commit 6d1fafcaecaa2e66eb9861a39d22fc7380ce6f78 Author: Florian Westphal <fw(a)strlen.de> Date: Thu Nov 22 01:32:46 2012 +0000 netfilter: ctnetlink: nla_policy updates Add stricter checking for a few attributes. Note that these changes don't fix any bug in the current code base. Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> commit 0360ae412d09bc6f4864c801effcb20bfd84520e Author: Florian Westphal <fw(a)strlen.de> Date: Fri Nov 23 06:22:21 2012 +0000 netfilter: kill support for per-af queue backends We used to have several queueing backends, but nowadays only nfnetlink_queue remains. In light of this there doesn't seem to be a good reason to support per-af registering -- just hook up nfnetlink_queue on module load and remove it on unload. This means that the userspace BIND/UNBIND_PF commands are now obsolete; the kernel will ignore them. Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> commit d871befe357ccc262edbb0a4f9aeea650012edf5 Author: Pablo Neira Ayuso <pablo(a)netfilter.org> Date: Tue Nov 27 14:49:42 2012 +0100 netfilter: ctnetlink: dump entries from the dying and unconfirmed lists This patch adds a new operation to dump the content of the dying and unconfirmed lists. Under some situations, the global conntrack counter can be inconsistent with the number of entries that we can dump from the conntrack table. The way to resolve this is to allow dumping the content of the unconfirmed and dying lists, so far it was not possible to look at its content. This provides some extra instrumentation to resolve problematic situations in which anyone suspects memory leaks. Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> commit 04dac0111da7e1d284952cd415162451ffaa094d Author: Pablo Neira Ayuso <pablo(a)netfilter.org> Date: Tue Nov 27 21:30:52 2012 +0100 netfilter: nf_conntrack: improve nf_conn object traceability This patch modifies the conntrack subsystem so that all existing allocated conntrack objects can be found in any of the following places: * the hash table, this is the typical place for alive conntrack objects. * the unconfirmed list, this is the place for newly created conntrack objects that are still traversing the stack. * the dying list, this is where you can find conntrack objects that are dying or that should die anytime soon (eg. once the destroy event is delivered to the conntrackd daemon). Thus, we make sure that we follow the track for all existing conntrack objects. This patch, together with some extension of the ctnetlink interface to dump the content of the dying and unconfirmed lists, will help in case to debug suspected nf_conn object leaks. Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> commit 9076aea76538556224e7d73ab718f8841330818a Author: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> Date: Tue Nov 27 09:58:09 2012 +0000 netfilter: ipset: Increase the number of maximal sets automatically The max number of sets was hardcoded at kernel cofiguration time and could only be modified via a module parameter. The patch adds the support of increasing the max number of sets automatically, as needed. The array of sets is incremented by 64 new slots if we run out of empty slots. The absolute limit for the maximal number of sets is limited by 65534. Signed-off-by: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> commit 60e476d02129acb1f863a9b4932358678ee6a355 Author: Cyril Roelandt <tipecaml(a)gmail.com> Date: Sat Dec 1 16:40:17 2012 +0000 bna: remove useless calls to memset(). These calls are followed by calls to memcpy() on the same memory area, so they can safely be removed. Signed-off-by: Cyril Roelandt <tipecaml(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 02275a2ee7c0ea475b6f4a6428f5df592bc9d30b Author: Willy Tarreau <w(a)1wt.eu> Date: Sun Dec 2 11:49:27 2012 +0000 tcp: don't abort splice() after small transfers TCP coalescing added a regression in splice(socket->pipe) performance, for some workloads because of the way tcp_read_sock() is implemented. The reason for this is the break when (offset + 1 != skb->len). As we released the socket lock, this condition is possible if TCP stack added a fragment to the skb, which can happen with TCP coalescing. So let's go back to the beginning of the loop when this happens, to give a chance to splice more frags per system call. Doing so fixes the issue and makes GRO 10% faster than LRO on CPU-bound splice() workloads instead of the opposite. Signed-off-by: Willy Tarreau <w(a)1wt.eu> Signed-off-by: Eric Dumazet <edumazet(a)google.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 077b393d05915f04e2629bfc47c6fce95cae7d3f Author: Eric Dumazet <edumazet(a)google.com> Date: Sun Dec 2 07:33:10 2012 +0000 net: fix sparse endianness warnings on sock_common # make C=2 CF=-D__CHECK_ENDIAN__ net/ipv4/inet_hashtables.o ... net/ipv4/inet_hashtables.c:242:7: warning: restricted __portpair degrades to integer net/ipv4/inet_hashtables.c:242:7: warning: restricted __addrpair degrades to integer ... Move __portpair/__addrpair from include/net/inet_hashtables.h to include/net/sock.h where we need them in struct sock_common Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Eric Dumazet <edumazet(a)google.com> Cc: Ling Ma <ling.ma.program(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 049b467d7a57e7b978ce063ee3639670f383fb5c Author: Barak Witkowski <barak(a)broadcom.com> Date: Sun Dec 2 04:05:57 2012 +0000 bnx2x: Correct PFC disablement bnx2x driver could only have enabled pfc via usage of dcbnl; now, it can also correctly disable it. Signed-off-by: Barak Witkowski <barak(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit cd1dfce2ed571bc3d1962987b5c7d2d6e936bb27 Author: Yuval Mintz <yuvalmin(a)broadcom.com> Date: Sun Dec 2 04:05:56 2012 +0000 bnx2x: fix 'Ethtool -A' when autoneg When configuring pauses using 'ethtool -A', the requested values have effect when used together with autoneg (up to this point, when configured for autoneg, driver ignored requested pause configuration) Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 0370cf901dd923ce784efe486c8ba66babad693b Author: Barak Witkowski <barak(a)broadcom.com> Date: Sun Dec 2 04:05:55 2012 +0000 bnx2x: prevent DCB if disabled in nvram Signed-off-by: Barak Witkowski <barak(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 27c1151c324b5a7dacd2d03e54b7c99aa5b67f27 Author: Yaniv Rosner <yaniv.rosner(a)broadcom.com> Date: Sun Dec 2 04:05:54 2012 +0000 bnx2x: Handle a rarely missed interrupt A rare case of no link due to a missed interrupt may occur due to a race condition between acknowledging the IGU via the BAR and restoring the NIG interrupt mask via the GRC. To solve it, we wait for the IGU ack command to finish prior to restoring the NIG interrupt mask. Signed-off-by: Yaniv Rosner <yaniv.rosner(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit b343d0025b08a1ef543e3cabf8b753d84b938d48 Author: Yuval Mintz <yuvalmin(a)broadcom.com> Date: Sun Dec 2 04:05:53 2012 +0000 bnx2x: mask CPL_OF interrupt Unmasked interrupt caused "FATAL HW block attention set2 0x20" messages to erroneously appear, as the associated interrupt is fully recoverable. Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 9b341bb1d8e6bc9f00044bd9d66824505b127e4a Author: Barak Witkowski <barak(a)broadcom.com> Date: Sun Dec 2 04:05:52 2012 +0000 bnx2x: IGU parse error cause probe failure If IGU parse error is encountered during the probing process, the error propagates and the probe gracefully fails (until now, such errors were ignored, later causing mischief). Signed-off-by: Barak Witkowski <barak(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 382e513a18ef988e547b0744c63c110aa052afd2 Author: Yuval Mintz <yuvalmin(a)broadcom.com> Date: Sun Dec 2 04:05:51 2012 +0000 bnx2x: Ext. config accessed only on non-E1x. Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 7964211d3891d0271c5fc8087cd49c018b30476d Author: Yuval Mintz <yuvalmin(a)broadcom.com> Date: Sun Dec 2 04:05:50 2012 +0000 bnx2x: nvram enables dropless flow control It is now possible to enable dropless flow control via nvram. Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 59694f0087b6a31893719eb396be8698735b66d3 Author: Yuval Mintz <yuvalmin(a)broadcom.com> Date: Sun Dec 2 04:05:49 2012 +0000 bnx2x: Correct advertised speed/duplex If link is down due to management (and not due to actual phy link being lost), driver should still behave as if the link is down; Querying via ethtool about speed/duplex state should result in 'UNKNOWN' (same behaviour as when link is actually down). Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit c96bdc0c9e86ac243c5eff41c0c1418cbbc3057c Author: Dmitry Kravkov <dmitry(a)broadcom.com> Date: Sun Dec 2 04:05:48 2012 +0000 bnx2x: Filter packets on FCoE rings Whenever bnx2x fails to transmit a packet due to a full Tx ring, if the ring size is zero (indicating an FCoE ring) driver filters the packet out and gracefully continues. Driver also gathers statistics on such filtered packets. Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 4c704899328bcb448d9c7fa709777b3e28e05f6a Author: Barak Witkowski <barak(a)broadcom.com> Date: Sun Dec 2 04:05:47 2012 +0000 bnx2x: Management can control PFC/ETS If configured for PFC/ETS by management, configure chip regardless of the presence of a remote peer which supports DCBX. Signed-off-by: Barak Witkowski <barak(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit c55e771b7e6274f7e12d5bcaa8e7dec8a1e41c42 Author: Barak Witkowski <barak(a)broadcom.com> Date: Sun Dec 2 04:05:46 2012 +0000 bnx2x: parity recovery flow enhancement Parity recovery was enhanced in order to handle a few more corner cases. Signed-off-by: Barak Witkowski <barak(a)broadcom.com> Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit d6d99a3f7e9169ef351340b217b48accab78e849 Author: Yuval Mintz <yuvalmin(a)broadcom.com> Date: Sun Dec 2 04:05:45 2012 +0000 bnx2x: revised and corrected SPIO access Changed naming convention of SPIO macros, and prevented access to invalid SPIOs. Signed-off-by: Yuval Mintz <yuvalmin(a)broadcom.com> Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit d317966bd3249ee7cd912931ab013c49cb77b9a4 Author: Amir Vadai <amirv(a)mellanox.com> Date: Sun Dec 2 03:49:23 2012 +0000 net/mlx4_en: Set number of rx/tx channels using ethtool Add support to changing number of rx/tx channels using ethtool ('ethtool -[lL]'). Where the number of tx channels specified in ethtool is the number of rings per user priority - not total number of tx rings. Signed-off-by: Amir Vadai <amirv(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 79c54b6bbf06a4ecd5343ea3687cd36c01f76d56 Author: Amir Vadai <amirv(a)mellanox.com> Date: Sun Dec 2 03:49:22 2012 +0000 net/mlx4_en: Fix TX moderation info loss after set_ringparam is called We need to re-set tx moderation information after calling set_ringparam else default tx moderation will be used. Also avoid related code duplication, by putting it in a utility function. Signed-off-by: Amir Vadai <amirv(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 2c46c9d5779d40e4a2f36f24017de4342344e258 Author: Amir Vadai <amirv(a)mellanox.com> Date: Sun Dec 2 03:49:21 2012 +0000 MAINTAINERS: Add Mellanox ethernet driver - mlx4_en Set mlx4_en maintainer to Amir Vadai instead of Yevgeny Petrilin. Signed-off-by: Amir Vadai <amirv(a)mellanox.com> Cc: Yevgeny Petrilin <yevgenyp(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit ddb303301bed80f700db6f36870642a08016f266 Merge: 577b981 c48d49a Author: David S. Miller <davem(a)davemloft.net> Date: Sat Dec 1 20:45:24 2012 -0500 Merge git://git.infradead.org/users/dwmw2/atm David Woodhouse says: ==================== This is the result of pulling on the thread started by Krzysztof Mazur's original patch 'pppoatm: don't send frames to destroyed vcc'. Various problems in the pppoatm and br2684 code are solved, some of which were easily triggered and would panic the kernel. ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> commit c48d49aab0b5b48b40e00fe43927efed5fc09d88 Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Thu Nov 29 23:28:30 2012 +0000 solos-pci: remove list_vccs() debugging function No idea why we've gone so long dumping a list of VCCs with vci==0 on every ->open() call... Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit a1db5c5b75d6781e8e4dcd6621d5c10463bee0ef Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Thu Nov 29 23:27:20 2012 +0000 solos-pci: use GFP_KERNEL where possible, not GFP_ATOMIC Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 213e85d389124f49c82d52cfb4473b8bb672f7c1 Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Thu Nov 29 23:15:30 2012 +0000 solos-pci: clean up pclose() function - Flush pending TX skbs from the queue rather than waiting for them all to complete (suggested by Krzysztof Mazur <krzysiek(a)podlesie.net>). - Clear ATM_VF_ADDR only when the PKT_PCLOSE packet has been submitted. - Don't clear ATM_VF_READY at all — vcc_destroy_socket() does that for us. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 5b4d72080f49498d2390563aa90f5bc31785406c Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Wed Nov 28 10:15:05 2012 +0000 pppoatm: optimise PPP channel wakeups after sock_owned_by_user() We don't need to schedule the wakeup tasklet on *every* unlock; only if we actually blocked the channel in the first place. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Acked-by: Krzysztof Mazur <krzysiek(a)podlesie.net> commit 9eba25268e5862571d53122065616c456fe1142a Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Wed Nov 28 09:08:04 2012 +0100 br2684: allow assign only on a connected socket The br2684 does not check if used vcc is in connected state, causing potential Oops in pppoatm_send() when vcc->send() is called on not fully connected socket. Now br2684 can be assigned only on connected sockets; otherwise -EINVAL error is returned. Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 007ef52be171b9eee6f4099d3e5706e8068d31ef Author: Nathan Williams <nathan(a)traverse.com.au> Date: Tue Nov 27 17:34:09 2012 +1100 solos-pci: Fix leak of skb received for unknown vcc ... and ensure that the next skb is set up for RX in the DMA case. Signed-off-by: Nathan Williams <nathan(a)traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit d71ffeb12378243babb2227acfed0c8d263e237e Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Wed Nov 28 00:46:45 2012 +0000 br2684: fix module_put() race The br2684 code used module_put() during unassignment from vcc with hope that we have BKL. This assumption is no longer true. Now owner field in atmvcc is used to move this module_put() to vcc_destroy_socket(). Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Acked-by: Krzysztof Mazur <krzysiek(a)podlesie.net> commit 0e56d99a5b557c760394d6941d7d1fc8d279eff3 Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Wed Nov 28 00:05:52 2012 +0000 pppoatm: fix missing wakeup in pppoatm_send() Now that we can return zero from pppoatm_send() for reasons *other* than the queue being full, that means we can't depend on a subsequent call to pppoatm_pop() waking the queue, and we might leave it stalled indefinitely. Use the ->release_cb() callback to wake the queue after the sock is unlocked. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Acked-by: Krzysztof Mazur <krzysiek(a)podlesie.net> commit b89588531f1db93a218c108eee713ff6002a67bf Author: David Woodhouse <dwmw2(a)infradead.org> Date: Tue Nov 27 23:28:36 2012 +0000 br2684: don't send frames on not-ready vcc Avoid submitting packets to a vcc which is being closed. Things go badly wrong when the ->pop method gets later called after everything's been torn down. Use the ATM socket lock for synchronisation with vcc_destroy_socket(), which clears the ATM_VF_READY bit under the same lock. Otherwise, we could end up submitting a packet to the device driver even after its ->ops->close method has been called. And it could call the vcc's ->pop method after the protocol has been shut down. Which leads to a panic. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Acked-by: Krzysztof Mazur <krzysiek(a)podlesie.net> commit c971f08cba56ed17fe22040ca5ff97fe5c3f0bd7 Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Wed Nov 28 00:03:11 2012 +0000 atm: add release_cb() callback to vcc The immediate use case for this is that it will allow us to ensure that a pppoatm queue is woken after it has to drop a packet due to the sock being locked. Note that 'release_cb' is called when the socket is *unlocked*. This is not to be confused with vcc_release() — which probably ought to be called vcc_close(). Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Acked-by: Krzysztof Mazur <krzysiek(a)podlesie.net> commit 7ad3eadebcb1778c11bbf0fe059d0804173a8123 Author: David Woodhouse <David.Woodhouse(a)intel.com> Date: Tue Nov 27 23:49:24 2012 +0000 solos-pci: wait for pending TX to complete when releasing vcc We should no longer be calling the old pop routine for the vcc, after vcc_release() has completed. Make sure we wait for any pending TX skbs to complete, by waiting for our own PKT_PCLOSE control skb to be sent. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 577b981714b0b3530817569bf705bd74881efc83 Author: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Date: Fri Nov 30 20:01:25 2012 +0000 qlcnic: remove duplicated include from qlcnic_sysfs.c Remove duplicated include. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Acked-by: Sony Chacko <sony.chacko(a)qlogic.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 30828d2b6070f1a4c71f26da75cda4bcdabfca02 Author: Andrew Gallatin <gallatin(a)myri.com> Date: Fri Nov 30 12:31:26 2012 +0000 myri10ge: fix incorrect use of ntohs() 1b4c44e6369dbbafd113f1e00b406f1eda5ab5b2 incorrectly used ntohs() rather than htons() in myri10ge_vlan_rx(). Thanks to Fengguang Wu, Yuanhan Liu's kernel-build tester for pointing out this bug. Signed-off-by: Andrew Gallatin <gallatin(a)myri.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit aeaf6e9d2f49d793d3eb8c1af4095cf25e061b94 Author: Shmulik Ladkani <shmulik.ladkani(a)gmail.com> Date: Fri Nov 30 10:25:59 2012 +0000 ipv6: unify logic evaluating inet6_dev's accept_ra property As of 026359b [ipv6: Send ICMPv6 RSes only when RAs are accepted], the logic determining whether to send Router Solicitations is identical to the logic determining whether kernel accepts Router Advertisements. However the condition itself is repeated in several code locations. Unify it by introducing 'ipv6_accept_ra()' accessor. Also, simplify the condition expression, making it more readable. No semantic change. Signed-off-by: Shmulik Ladkani <shmulik.ladkani(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit fd90b29d757827ab12d6669292612308ec249532 Author: Eric Dumazet <edumazet(a)google.com> Date: Fri Nov 30 10:08:52 2012 +0000 tcp: change default tcp hash size As time passed, available memory increased faster than number of concurrent tcp sockets. As a result, a machine with 4GB of ram gets a hash table with 524288 slots, using 8388608 bytes of memory. Lets change that by a 16x factor (one slot for 128 KB of ram) Even if a small machine needs a _lot_ of sockets, tcp lookups are now very efficient, using one cache line per socket. Signed-off-by: Eric Dumazet <edumazet(a)google.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit abe303dbc22bd16cde6f1a62fc25f63cc254caf7 Merge: a20da98 b9cc977 Author: David S. Miller <davem(a)davemloft.net> Date: Sat Dec 1 11:30:10 2012 -0500 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next Ben Hutchings says: ==================== 1. More workarounds for TX queue flush failures that can occur during interface reconfiguration. 2. Fix spurious failure of a firmware request running during a system clock change, e.g. ntpd started at the same time as driver load. 3. Fix inconsistent statistics after a firmware upgrade. 4. Fix a variable (non-)initialisation in offline self-test that can make it more disruptive than intended. 5. Fix a race that can (at least) cause an assertion failure. 6. Miscellaneous cleanup. ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> commit a20da984fb5ddedb9e8e699c04e10fe0ca609440 Merge: ce43b03 ed83da1 Author: David S. Miller <davem(a)davemloft.net> Date: Sat Dec 1 11:27:31 2012 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== This series contains updates to ixgbe, igb and e1000e. Majority of the changes are against igb. ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> commit ed83da12ee742da8cefa784def3af64e4e195462 Author: Alexander Duyck <alexander.h.duyck(a)intel.com> Date: Tue Nov 13 01:13:33 2012 +0000 ixgbe: Do not parse past IP header on fragments beyond the first This change makes it so that only the first fragment in a series of fragments will have the L4 header pulled. Previously we were always pulling the L4 header as well and in the case of UDP this can harm performance since only the first fragment will have the header, the rest just contain data which should be left in the paged portion of the packet. Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com> Tested-by: Stephen Ko <stephen.s.ko(a)intel.com> Tested-by: Marcus Dennis <marcusx.e.dennis(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit e921eb1ac411a32b98fa1a9ccbba1b24fae8de2d Author: Bruce Allan <bruce.w.allan(a)intel.com> Date: Wed Nov 28 09:28:37 2012 +0000 e1000e: cosmetic cleanup of comments Update comments to conform to the preferred style for networking code as described in ./Documentation/CodingStyle and checked for in the recently added checkpatch NETWORKING_BLOCK_COMMENT_STYLE test. Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com> Tested-by: Aaron Brown <aaron.f.brown(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit daf56e406a94675d454f996cab56c3d0b0a0d8a6 Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Date: Tue Oct 23 12:54:33 2012 +0000 igb: Fix SerDes autoneg flow control. This patch enables flow control to be set in SerDes autoneg mode. This is done the way it is done for copper, but relies on a different set of register/bit checks since this is all done within the MAC registers. Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Tested-by: Aaron Brown <aaron.f.brown(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit 3860a0bf748bf98a30f2bab73d5e3653583f7b47 Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Date: Thu Nov 22 02:49:22 2012 +0000 igb: Unset sigdetect for SERDES loopback on 82580 and i350 This patch unsets the sigdetect bit for SERDES loopback tests on 82580 and i350 parts. The loopback test can fail on these parts without this setting. Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Tested-by: Aaron Brown <aaron.f.brown(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit a0483e2eb63d3b2f14a821edb21b3e610bfba5bd Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Date: Thu Nov 22 01:24:08 2012 +0000 igb: Workaround for global device reset problem on 82580. Due to a hw errata, the global device reset doesn't always work on 82580 devices. This patch works around the problem not trying to do a global device reset on these devices. Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Tested-by: Aaron Brown <aaron.f.brown(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit 7916a53d203f12461095886cf72d58e9281240d9 Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Date: Wed Nov 21 04:44:10 2012 +0000 igb: Refactoring of i210 file. This patch refactors the functions in e1000_i210.c in order to remove need for prototypes. Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Tested-by: Aaron Brown <aaron.f.brown(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit 23e0f1488f193d53d282404c1ab50112cb237341 Author: Akeem G. Abodunrin <akeem.g.abodunrin(a)intel.com> Date: Sat Nov 3 03:08:41 2012 +0000 igb: Acquire, release semaphore for writing each EEPROM page This patch allows software acquires and releases NVM resource for writing each EEPROM page, instead of holding semaphore for the whole data block which is too long and could trigger write fails on unpredictable addresses. Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin(a)intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit 1720ee3e4054eff175743820ceba16ecfe97943a Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Date: Thu Oct 11 02:15:45 2012 +0000 igb: Updates to read nvm function for i211 device The i211 has an integrated secure space to store configuration information that is usually stored in an EEPROM or flash type device. This patch updates the read functions to return values or appropriate error codes to prevent unnecessary init failures on some configuration schemes. Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit 3288d735781f8873775e5d2e5d33507119f79cca Author: joshua.a.hay(a)intel.com <joshua.a.hay(a)intel.com> Date: Wed Nov 28 05:49:20 2012 +0000 ixgbe: eliminate Smatch warnings in ixgbe_debugfs.c This patch replaces calls to copy_to_user, copy_from_user, and the associated logic, with calls to simple_read_from_buffer and simple_write_to_buffer respectively. This was done to eliminate warnings generated by the Smatch static analysis tool. v2- Fix return values based community feedback Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> CC: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Josh Hay <joshua.a.hay(a)intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt(a)intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> commit b9cc977d9d4d1866ee83df38815f4b3b34d99dd9 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Wed Nov 28 04:12:41 2012 +0000 sfc: Make module parameters really boolean Most of the module parameters treated as boolean are currently exposed as type int or uint. Defining them with the proper type is useful documentation for both users and developers. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit ebf98e797b4e26ad52ace1511a0b503ee60a6cd4 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Sat Dec 1 02:21:17 2012 +0000 sfc: Fix timekeeping in efx_mcdi_poll() efx_mcdi_poll() uses get_seconds() to read the current time and to implement a polling timeout. The use of this function was chosen partly because it could easily be replaced in a co-sim environment with a macro that read the simulated time. Unfortunately the real get_seconds() returns the system time (real time) which is subject to adjustment by e.g. ntpd. If the system time is adjusted forward during a polled MCDI operation, the effective timeout can be shorter than the intended 10 seconds, resulting in a spurious failure. It is also possible for a backward adjustment to delay detection of a areal failure. Use jiffies instead, and change MCDI_RPC_TIMEOUT to be denominated in jiffies. Also correct rounding of the timeout: check time > finish (or rather time_after(time, finish)) and not time >= finish. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit c2f3b8e3a44b6fe9e36704e30157ebe1a88c08b1 Author: Daniel Pieczko <dpieczko(a)solarflare.com> Date: Wed Oct 17 13:21:23 2012 +0100 sfc: lock TX queues when calling netif_device_detach() The assertion of netif_device_present() at the top of efx_hard_start_xmit() may fail if we don't do this. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit 525d9e824018cd7cc8d8d44832ddcd363abfe6e1 Author: Daniel Pieczko <dpieczko(a)solarflare.com> Date: Tue Oct 2 13:36:18 2012 +0100 sfc: Work-around flush timeout when flushes have completed We sometimes hit a "failed to flush" timeout on some TX queues, but the flushes have completed and the flush completion events seem to go missing. In this case, we can check the TX_DESC_PTR_TBL register and drain the queues if the flushes had finished. [bwh: Minor fixes to coding style] Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit 876be083b669c43203c0ee8709d749896e1d8d60 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Mon Oct 1 20:58:35 2012 +0100 sfc: Reset driver's MAC stats after MC reboot seen If the MC reboots then the stats it reports to us will have been reset. We need to reset ours to get efx_update_diff_stat() working properly. (Ideally we would maintain stats across the reboot, but as this should only happen immediately after a firmware upgrade it's not really worth the trouble.) Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit c3771a35bebeea16c4fd94d1116010cc02b1f75e Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Wed Sep 19 00:31:18 2012 +0100 sfc: Do not initialise buffer in efx_alloc_special_buffer() Currently we initialise the newly allocated buffer to all-1s, which is important for event queues but not for descriptor queues. And since we also do that in efx_nic_init_eventq(), it is completely pointless to do it here. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit ef492f11efed9a6a1686bf914fb74468df59385c Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Sat Dec 1 01:55:27 2012 +0000 sfc: Correctly initialise reset_method in siena_test_chip() Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit 778cdaf639e34288c298f1d3d3503d0724ceabc7 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Tue Sep 18 01:56:50 2012 +0100 sfc: Remove confusing MMIO functions efx_writed_table() uses a step of 16 bytes but efx_readd_table() uses a step of 4 bytes. Why are they different? Firstly, register access is asymmetric: - The EVQ_RPTR table and RX_INDIRECTION_TBL can (or must?) be written as dwords even though they have a step size of 16 bytes, unlike most other CSRs. - In general, a read of any width is valid for registers, so long as it does not cross register boundaries. There is also no latching behaviour in the BIU, contrary to rumour. We write to the EVQ_RPTR table with efx_writed_table() but never read it back as it's write-only. We write to the RX_INDIRECTION_TBL with efx_writed_table(), but only read it back for the register dump, where we use efx_reado_table() as for any other table with step size of 16. We read MC_TREG_SMEM with efx_readd_table() for the register dump, but normally read and write it with efx_readd() and efx_writed() using offsets calculated in bytes. Since these functions are trivial and have few callers, it's clearer to open-code them at the call sites. While we're at it, update the comments on the BIU behaviour again. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit bbec969b7f57a6ab5683145b99da869f99080e2a Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Tue Sep 11 18:25:13 2012 +0100 sfc: Fix check for failure of MC_CMD_FLUSH_RX_QUEUES efx_mcdi_rpc_start() returns a negative value on error or zero on success. However one caller that can't properly handle failure then does WARN_ON(rc > 0). Change it to WARN_ON(rc < 0). Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit b8e0251730775cc970d2453dedd454b8ae071dd9 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Thu Sep 6 23:54:15 2012 +0100 sfc: Delete redundant page_addr variable from efx_init_rx_buffers_page() Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit d5e8cc6c946e0857826dcfbb3585068858445bfe Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Thu Sep 6 16:52:31 2012 +0100 sfc: Really disable flow control while flushing Receiving pause frames can block TX queue flushes. Earlier changes work around this by reconfiguring the MAC during flushes for VFs, but during flushes for the PF we would only change the fc_disable counter. Unless the MAC is reconfigured for some other reason during the flush (which I would not expect to happen) this had no effect at all. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit 3f978ef36cca9bb10c88a56baec1d9d1cb072b98 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Thu Sep 6 02:11:06 2012 +0100 sfc: Fix byte order warning in self-test Add necessary cast when setting a bogus checksum. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit 0e0c3408a5414d4e1f8ca7fadcb513c13bd747e8 Author: Ben Hutchings <bhutchings(a)solarflare.com> Date: Thu Sep 6 02:11:04 2012 +0100 sfc: Fix byte order warnings for ethtool RX filter interface sparse has got a bit more picky since I last ran it over this. Add forced casts for use of ~0 as a big-endian value. Undo the pointless optimisation of parameter validation with '|'; using '||' avoids these warnings. Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com> commit ce43b03e8889475817d427b1f3724c7e294b76eb Author: Eric Dumazet <edumazet(a)google.com> Date: Fri Nov 30 09:49:27 2012 +0000 net: move inet_dport/inet_num in sock_common commit 68835aba4d9b (net: optimize INET input path further) moved some fields used for tcp/udp sockets lookup in the first cache line of struct sock_common. This patch moves inet_dport/inet_num as well, filling a 32bit hole on 64 bit arches and reducing number of cache line misses in lookups. Also change INET_MATCH()/INET_TW_MATCH() to perform the ports match before addresses match, as this check is more discriminant. Remove the hash check from MATCH() macros because we dont need to re validate the hash value after taking a refcount on socket, and use likely/unlikely compiler hints, as the sk_hash/hash check makes the following conditional tests 100% predicted by cpu. Introduce skc_addrpair/skc_portpair pair values to better document the alignment requirements of the port/addr pairs used in the various MATCH() macros, and remove some casts. The namespace check can also be done at last. This slightly improves TCP/UDP lookup times. IP/TCP early demux needs inet->rx_dst_ifindex and TCP needs inet->min_ttl, lets group them together in same cache line. With help from Ben Hutchings & Joe Perches. Idea of this patch came after Ling Ma proposal to move skc_hash to the beginning of struct sock_common, and should allow him to submit a final version of his patch. My tests show an improvement doing so. Signed-off-by: Eric Dumazet <edumazet(a)google.com> Cc: Ben Hutchings <bhutchings(a)solarflare.com> Cc: Joe Perches <joe(a)perches.com> Cc: Ling Ma <ling.ma.program(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit b02a80674ea3905926c1a942426008d732c47339 Author: Haiyang Zhang <haiyangz(a)microsoft.com> Date: Fri Nov 30 09:23:41 2012 +0000 hyperv: Add an error message to rndis_filter_set_device_mac() This message indicates an error returned from the host when changing MAC address. Reported-by: Michal Kubecek <mkubecek(a)suse.com> Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com> Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 1b4c44e6369dbbafd113f1e00b406f1eda5ab5b2 Author: Andrew Gallatin <gallatin(a)myri.com> Date: Fri Nov 30 08:31:59 2012 +0000 myri10ge: Add vlan rx for better GRO perf. Unlike LRO, GRO requires that vlan tags be removed before aggregation can occur. Since the myri10ge NIC does not support hardware vlan tag offload, we must remove the tag in the driver to achieve performance comparable to LRO for vlan tagged frames. Thanks to Eric Duzamet for his help simplifying the original patch. Signed-off-by: Andrew Gallatin <gallatin(a)myri.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 4ca3221fe4b6c4c6c77352672942e8afa57d55e5 Author: Andrew Gallatin <gallatin(a)myri.com> Date: Fri Nov 30 08:31:58 2012 +0000 myri10ge: Convert from LRO to GRO Convert myri10ge from LRO to GRO, and simplify the driver by removing various LRO-related code which is no longer needed including ndo_fix_features op, custom skb building from frags, and LRO header parsing. Signed-off-by: Andrew Gallatin <gallatin(a)myri.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit ba57b6f20429028127618230b74d55e8eb9cfce3 Author: Jiri Slaby <jslaby(a)suse.cz> Date: Fri Nov 30 07:05:40 2012 +0000 MAINTAINERS: fix bouncing tun/tap entries Delivery to the following recipient failed permanently: vtun(a)office.satix.net Technical details of permanent failure: DNS Error: Domain name not found Of course: $ host office.satix.net Host office.satix.net not found: 3(NXDOMAIN) =========== And "Change of Email Address Notification": Old Address New Address Email Subject ------------------------------------------------------ maxk(a)qualcomm.com maxk(a)qti.qualcomm.com "tuntap: multiqueue... Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> Cc: Maxim Krasnyansky <maxk(a)qti.qualcomm.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit b052e0737593c2a9c9b5f984e19e99f45435ef75 Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 05:55:52 2012 +0000 smsc95xx: expand check_ macros These macros, while reducing the amount of code, hide flow control and make the code more confusing to follow and review. This patch expands them. It should have no functional effect on the driver. Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 068bb1a75a94eacfaaacf3b0ecf4feb349fa8e13 Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 05:55:51 2012 +0000 smsc95xx: fix smsc_crc return type This patch fixes a bug introduced in bbd9f9e which could prevent some wakeups from working correctly if multiple wol options were selected. This helper function calculates a 16-bit crc and shifts it into either the high or low 16 bits of a u32 so the caller can or it directly into place. The function previously had a u16 return type so would always have returned zero when filter was odd. Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Reported-by: Bjorn Mork <bjorn(a)mork.no> Cc: Joe Perches <joe(a)perches.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 3b14692c01e0b68f0ce51138dfcea967a63cd7bb Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 05:55:50 2012 +0000 smsc95xx: don't enable remote wakeup directly As pointed out by Bjorn Mork, the generic "usb" driver sets this for us so no need to directly set it in this driver. Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Cc: Bjorn Mork <bjorn(a)mork.no> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 3b9f7d8cdb6db2b6ba78c149dacec3d72591c544 Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 05:55:49 2012 +0000 smsc95xx: fix error handling in suspend failure case This patch ensures that if we fail to suspend the LAN9500 device we call usbnet_resume before returning failure, instead of leaving the usbnet driver in an unusable state. Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit eed9a72914a2b2737a0d91b80579f878999574ef Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 05:55:48 2012 +0000 smsc95xx: fix suspend buffer overflow This patch fixes a buffer overflow introduced by bbd9f9e, where the filter_mask array is accessed beyond its bounds. Updated to also add a check for kzalloc failure, as reported by Bjorn Mork and Joe Perches. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Cc: Bjorn Mork <bjorn(a)mork.no> Cc: Joe Perches <joe(a)perches.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit e3c678e6d7484dc03fc36d3bfebb8ebb94574110 Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 04:52:44 2012 +0000 smsc75xx: expand check_ macros These macros, while reducing the amount of code, hide flow control and make the code more confusing to follow and review. This patch expands them. It should have no functional effect on the driver. Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 2305c54ffc389f1e73f2b1122a4c75bb0e8e6601 Author: Steve Glendinning <steve.glendinning(a)shawell.net> Date: Fri Nov 30 04:52:43 2012 +0000 smsc75xx: don't call usbnet_resume if usbnet_suspend fails If usbnet_suspend returns an error we don't want to call usbnet_resume to clean up, but instead just return the error. If usbnet_suspend *does* succeed, and we have a problem further on, the desired behaviour is still to call usbnet_resume to clean up before returning. Signed-off-by: Steve Glendinning <steve.glendinning(a)shawell.net> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 06a31e2b918dd992dd104e082ec8a33d6235c7b3 Author: Thomas Graf <tgraf(a)suug.ch> Date: Fri Nov 30 02:16:27 2012 +0000 sctp: verify length provided in heartbeat information parameter If the variable parameter length provided in the mandatory heartbeat information parameter exceeds the calculated payload length the packet has been corrupted. Reply with a parameter length protocol violation message. Signed-off-by: Thomas Graf <tgraf(a)suug.ch> Acked-by: Neil Horman <nhorman(a)tuxdriver.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit c07135633bee3f01a6454d15b6411f32cfbeb2fd Author: Rami Rosen <ramirose(a)gmail.com> Date: Fri Nov 30 01:08:47 2012 +0000 rtnelink: remove unused parameter from rtnl_create_link(). This patch removes an unused parameter (src_net) from rtnl_create_link() method and from the method single invocation, in veth. This parameter was used in the past when calling ops->get_tx_queues(src_net, tb) in rtnl_create_link(). The get_tx_queues() member of rtnl_link_ops was replaced by two methods, get_num_tx_queues() and get_num_rx_queues(), which do not get any parameter. This was done in commit d40156aa5ecbd51fed932ed4813df82b56e5ff4d by Jiri Pirko ("rtnl: allow to specify different num for rx and tx queue count"). Signed-off-by: Rami Rosen <ramirose(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit dad52fd964c54aa275ebb5c935ef8d8b0eded74d Merge: ee3f34e af5d4f7 Author: David S. Miller <davem(a)davemloft.net> Date: Fri Nov 30 12:22:04 2012 -0500 Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Included changes: - Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN Signed-off-by: David S. Miller <davem(a)davemloft.net> commit ee3f34e857238a4552c68d860348893d7728bcab Author: Tommi Rantala <tt.rantala(a)gmail.com> Date: Thu Nov 29 23:17:42 2012 +0000 sctp: fix CONFIG_SCTP_DBG_MSG=y null pointer dereference in sctp_v6_get_dst() Trinity (the syscall fuzzer) triggered the following BUG, reproducible only when the kernel is configured with CONFIG_SCTP_DBG_MSG=y. When CONFIG_SCTP_DBG_MSG is not set, the null pointer is never dereferenced. ---[ end trace a4de0bfcb38a3642 ]--- BUG: unable to handle kernel NULL pointer dereference at 0000000000000100 IP: [<ffffffff8136796e>] ip6_string+0x1e/0xa0 PGD 4eead067 PUD 4e472067 PMD 0 Oops: 0000 [#1] PREEMPT SMP Modules linked in: CPU 3 Pid: 21324, comm: trinity-child11 Tainted: G W 3.7.0-rc7+ #61 ASUSTeK Computer INC. EB1012/EB1012 RIP: 0010:[<ffffffff8136796e>] [<ffffffff8136796e>] ip6_string+0x1e/0xa0 RSP: 0018:ffff88004e4637a0 EFLAGS: 00010046 RAX: ffff88004e4637da RBX: ffff88004e4637da RCX: 0000000000000000 RDX: ffffffff8246e92a RSI: 0000000000000100 RDI: ffff88004e4637da RBP: ffff88004e4637a8 R08: 000000000000ffff R09: 000000000000ffff R10: 0000000000000000 R11: 0000000000000000 R12: ffffffff8289d600 R13: ffffffff8289d230 R14: ffffffff8246e928 R15: ffffffff8289d600 FS: 00007fed95153700(0000) GS:ffff88005fd80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000100 CR3: 000000004eeac000 CR4: 00000000000007e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process trinity-child11 (pid: 21324, threadinfo ffff88004e462000, task ffff8800524b0000) Stack: ffff88004e4637da ffff88004e463828 ffffffff81368eee 000000004e4637d8 ffffffff0000ffff ffff88000000ffff 0000000000000000 000000004e4637f8 ffffffff826285d8 ffff88004e4637f8 0000000000000000 ffff8800524b06b0 Call Trace: [<ffffffff81368eee>] ip6_addr_string.isra.11+0x3e/0xa0 [<ffffffff81369183>] pointer.isra.12+0x233/0x2d0 [<ffffffff810a413a>] ? vprintk_emit+0x1ba/0x450 [<ffffffff8110953d>] ? trace_hardirqs_on_caller+0x10d/0x1a0 [<ffffffff81369757>] vsnprintf+0x187/0x5d0 [<ffffffff81369c62>] vscnprintf+0x12/0x30 [<ffffffff810a4028>] vprintk_emit+0xa8/0x450 [<ffffffff81e5cb00>] printk+0x49/0x4b [<ffffffff81d17221>] sctp_v6_get_dst+0x731/0x780 [<ffffffff81d16e15>] ? sctp_v6_get_dst+0x325/0x780 [<ffffffff81d00a96>] sctp_transport_route+0x46/0x120 [<ffffffff81cff0f1>] sctp_assoc_add_peer+0x161/0x350 [<ffffffff81d0fd8d>] sctp_sendmsg+0x6cd/0xcb0 [<ffffffff81b55bf0>] ? inet_create+0x670/0x670 [<ffffffff81b55cfb>] inet_sendmsg+0x10b/0x220 [<ffffffff81b55bf0>] ? inet_create+0x670/0x670 [<ffffffff81a72a64>] ? sock_update_classid+0xa4/0x2b0 [<ffffffff81a72ab0>] ? sock_update_classid+0xf0/0x2b0 [<ffffffff81a6ac1c>] sock_sendmsg+0xdc/0xf0 [<ffffffff8118e9e5>] ? might_fault+0x85/0x90 [<ffffffff8118e99c>] ? might_fault+0x3c/0x90 [<ffffffff81a6e12a>] sys_sendto+0xfa/0x130 [<ffffffff810a9887>] ? do_setitimer+0x197/0x380 [<ffffffff81e960d5>] ? sysret_check+0x22/0x5d [<ffffffff81e960a9>] system_call_fastpath+0x16/0x1b Code: 01 eb 89 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 f8 31 c9 48 89 e5 53 eb 12 0f 1f 40 00 48 83 c1 01 48 83 c0 04 48 83 f9 08 74 70 <0f> b6 3c 4e 89 fb 83 e7 0f c0 eb 04 41 89 d8 41 83 e0 0f 0f b6 RIP [<ffffffff8136796e>] ip6_string+0x1e/0xa0 RSP <ffff88004e4637a0> CR2: 0000000000000100 ---[ end trace a4de0bfcb38a3643 ]--- Signed-off-by: Tommi Rantala <tt.rantala(a)gmail.com> Acked-by: Vlad Yasevich <vyasevich(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 92a2ec72a7dbb84f4b614c9b72880d86db69475f Author: Alan Ott <alan(a)signal11.us> Date: Thu Nov 29 18:25:11 2012 +0000 mac802154: use kfree_skb() instead of dev_kfree_skb() kfree_skb() indicates failure, which is where this is being used. Signed-off-by: Alan Ott <alan(a)signal11.us> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit fcefbe9fcb3b0d72c91629f7fcf7ea09a46ab2c1 Author: Alan Ott <alan(a)signal11.us> Date: Thu Nov 29 18:25:10 2012 +0000 mac802154: fix memory leaks kfree_skb() was not getting called in the case of some failures. This was pointed out by Eric Dumazet. Signed-off-by: Alan Ott <alan(a)signal11.us> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit b333b7e6ec210412be49d1dc67b62d4e565a0cd6 Author: Alan Ott <alan(a)signal11.us> Date: Thu Nov 29 15:55:44 2012 +0000 6lowpan: consider checksum bytes in fragmentation threshold Change the threshold for framentation of a lowpan packet from using the MTU size to now use the MTU size minus the checksum length, which is added by the hardware. For IEEE 802.15.4, this effectively changes it from 127 bytes to 125 bytes. Signed-off-by: Alan Ott <alan(a)signal11.us> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit fed2c6fd1ffb7b24e55159eb40a5a7330be656c8 Merge: 481af03 823d7a1 Author: David S. Miller <davem(a)davemloft.net> Date: Fri Nov 30 12:12:05 2012 -0500 Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next Marc Kleine-Budde says: ==================== this pull request is for net-next/master. There is a patch by Alexander Stein fixing a reference counter problem which can make driver unloading impossible (stable Cc'ed). And several patches by me which remove an obsolete mechanism from several drivers, which is already handled at the infrastructure level. ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 481af03bfbc1e07954310689831ad2695b7c6a44 Author: Akinobu Mita <akinobu.mita(a)gmail.com> Date: Thu Nov 29 01:27:45 2012 +0000 mISDN: improve bitops usage This improves bitops usages in several points: - Convert u64 to a proper bitmap declaration. This enables to remove superfluous typecasting from 'u64' to 'unsigned long *'. - Convert superfluous atomic bitops to non atomic bitops. The bitmap is allocated on the stack and it is not accessed by any other threads, so using atomic bitops is not necessary. - Use find_next_zero_bit and find_next_zero_bit instead of calling test_bit() for each bit. Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Cc: Karsten Keil <isdn(a)linux-pingi.de> Cc: netdev(a)vger.kernel.org Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 6e22ce2c6e4315522526279365d6e86e8f67a5fa Author: Yi Zou <yi.zou(a)intel.com> Date: Wed Nov 28 13:45:24 2012 +0000 8021q: fix vlan device to inherit the unicast filtering capability flag This bug is observed on running FCoE over a VLAN device associated w/ a real device that has IFF_UNICAST_FLT set since FCoE would add unicast address such as FLOGI MAC to the VLAN interface that FCoE is on. Since currently, VLAN device is not inheriting the IFF_UNICAST_FLT flag from the parent real device even though the real device is capable of doing unicast filtering. This forces the VLAN device and its real device go to promiscuous mode unnecessarily even the added address is actually being added to the available unicast filter table in real device. Signed-off-by: Yi Zou <yi.zou(a)intel.com> Cc: devel(a)open-fcoe.org Signed-off-by: David S. Miller <davem(a)davemloft.net> commit e53665c6eaa6da6a4a4130ecc2fe9429c7ad2daf Author: Jiri Bohac <jbohac(a)suse.cz> Date: Wed Nov 28 04:42:14 2012 +0000 bonding: delete migrated IP addresses from the rlb hash table Bonding in balance-alb mode records information from ARP packets passing through the bond in a hash table (rx_hashtbl). At certain situations (e.g. link change of a slave), rlb_update_rx_clients() will send out ARP packets to update ARP caches of other hosts on the network to achieve RX load balancing. The problem is that once an IP address is recorded in the hash table, it stays there indefinitely. If this IP address is migrated to a different host in the network, bonding still sends out ARP packets that poison other systems' ARP caches with invalid information. This patch solves this by looking at all incoming ARP packets, and checking if the source IP address is one of the source addresses stored in the rx_hashtbl. If it is, but the MAC addresses differ, the corresponding hash table entries are removed. Thus, when an IP address is migrated, the first ARP broadcast by its new owner will purge the offending entries of rx_hashtbl. The hash table is hashed by ip_dst. To be able to do the above check efficiently (not walking the whole hash table), we need a reverse mapping (by ip_src). I added three new members in struct rlb_client_info: rx_hashtbl[x].src_first will point to the start of a list of entries for which hash(ip_src) == x. The list is linked with src_next and src_prev. When an incoming ARP packet arrives at rlb_arp_recv() rlb_purge_src_ip() can quickly walk only the entries on the corresponding lists, i.e. the entries that are likely to contain the offending IP address. To avoid confusion, I renamed these existing fields of struct rlb_client_info: next -> used_next prev -> used_prev rx_hashtbl_head -> rx_hashtbl_used_head (The current linked list is _not_ a list of hash table entries with colliding ip_dst. It's a list of entries that are being used; its purpose is to avoid walking the whole hash table when looking for used entries.) Signed-off-by: Jiri Bohac <jbohac(a)suse.cz> Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 567b871e503316b0927e54a3d7c86d50b722d955 Author: zheng.li <zheng.x.li(a)oracle.com> Date: Tue Nov 27 23:57:04 2012 +0000 bonding: rlb mode of bond should not alter ARP originating via bridge Do not modify or load balance ARP packets passing through balance-alb mode (wherein the ARP did not originate locally, and arrived via a bridge). Modifying pass-through ARP replies causes an incorrect MAC address to be placed into the ARP packet, rendering peers unable to communicate with the actual destination from which the ARP reply originated. Load balancing pass-through ARP requests causes an entry to be created for the peer in the rlb table, and bond_alb_monitor will occasionally issue ARP updates to all peers in the table instrucing them as to which MAC address they should communicate with; this occurs when some event sets rx_ntt. In the bridged case, however, the MAC address used for the update would be the MAC of the slave, not the actual source MAC of the originating destination. This would render peers unable to communicate with the destinations beyond the bridge. Signed-off-by: Zheng Li <zheng.x.li(a)oracle.com> Cc: Jay Vosburgh <fubar(a)us.ibm.com> Cc: Andy Gospodarek <andy(a)greyhouse.net> Cc: "David S. Miller" <davem(a)davemloft.net> Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> commit e7165030db8e932a9a968f7015cd3b2e984f8e7c Merge: bb72882 92eb1d4 Author: David S. Miller <davem(a)davemloft.net> Date: Fri Nov 30 12:01:30 2012 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch Conflicts: net/ipv6/exthdrs_core.c Jesse Gross says: ==================== This series of improvements for 3.8/net-next contains four components: * Support for modifying IPv6 headers * Support for matching and setting skb->mark for better integration with things like iptables * Ability to recognize the EtherType for RARP packets * Two small performance enhancements The movement of ipv6_find_hdr() into exthdrs_core.c causes two small merge conflicts. I left it as is but can do the merge if you want. The conflicts are: * ipv6_find_hdr() and ipv6_find_tlv() were both moved to the bottom of exthdrs_core.c. Both should stay. * A new use of ipv6_find_hdr() was added to net/netfilter/ipvs/ip_vs_core.c after this patch. The IPVS user has two instances of the old constant name IP6T_FH_F_FRAG which has been renamed to IP6_FH_F_FRAG. ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> commit 397ff16dce53888ec693b3718640be2560204751 Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Tue Nov 6 23:17:02 2012 +0100 pppoatm: do not inline pppoatm_may_send() The pppoatm_may_send() is quite heavy and it's called three times in pppoatm_send() and inlining costs more than 200 bytes of code (more than 10% of total pppoatm driver code size). add/remove: 1/0 grow/shrink: 0/1 up/down: 132/-367 (-235) function old new delta pppoatm_may_send - 132 +132 pppoatm_send 900 533 -367 Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 071d93931a75dc1f82f0baa9959613af81c5a032 Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Sat Nov 10 23:33:19 2012 +0100 pppoatm: drop frames to not-ready vcc The vcc_destroy_socket() closes vcc before the protocol is detached from vcc by calling vcc->push() with NULL skb. This leaves some time window, where the protocol may call vcc->send() on closed vcc and crash. Now pppoatm_send(), like vcc_sendmsg(), checks for vcc flags that indicate that vcc is not ready. If the vcc is not ready we just drop frame. Queueing frames is much more complicated because we don't have callbacks that inform us about vcc flags changes. Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 823d7a1f761d6404babaab04cc8b1724186cf2c8 Author: Marc Kleine-Budde <mkl(a)pengutronix.de> Date: Fri Jul 20 22:30:40 2012 +0200 can: pcan_usb_core: remove obsolete variable open_time The variable open_time in the struct peak_usb_device was used to protect peak_usb_set_mode() only to be called, if the interface is up. Now the CAN device infrastructure takes care of this. Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> commit e42870465025ac6c9f3dc45f45a69d3da2d85308 Author: Marc Kleine-Budde <mkl(a)pengutronix.de> Date: Fri Jul 20 22:30:40 2012 +0200 can: esd_usb2: remove obsolete variable open_time The variable open_time in the struct esd_usb2_net_priv was used to protect esd_usb2_set_mode() only to be called, if the interface is up. Now the CAN device infrastructure takes care of this. Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> commit 4480c008047d72a7d40e1e7fdc1d3b420ebcb955 Author: Marc Kleine-Budde <mkl(a)pengutronix.de> Date: Fri Jul 20 22:30:40 2012 +0200 can: ems_usb: remove obsolete variable open_time The variable open_time in the struct ems_usb was used to protect ems_usb_set_mode() only to be called, if the interface is up. Now the CAN device infrastructure takes care of this. Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> commit b2d0bf711f94969394a9c4a2f8923c286803cd34 Author: Marc Kleine-Budde <mkl(a)pengutronix.de> Date: Fri Jul 20 22:30:40 2012 +0200 can: sja1000: remove obsolete variable open_time The variable open_time in the struct sja1000_priv was used to protect sja1000_set_mode() only to be called, if the interface is up. Now the CAN device infrastructure takes care of this. Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> commit 49ed59b72cb03116682dd6ab5c04117cc710bff3 Author: Marc Kleine-Budde <mkl(a)pengutronix.de> Date: Fri Jul 20 22:30:40 2012 +0200 can: mscan: remove obsolete variable open_time The variable open_time in the struct mscan_priv was used to protect mscan_do_set_mode() only to be called, if the interface is up. Now the CAN device infrastructure takes care of this. Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> commit ab48b03ec9ae1840a1e427e2375bd0d9d554b4ed Author: Alexander Stein <alexander.stein(a)systec-electronic.com> Date: Tue Nov 27 08:52:34 2012 +0100 can: Do not call dev_put if restart timer is running upon close If the restart timer is running due to BUS-OFF and the device is disconnected an dev_put will decrease the usage counter to -1 thus blocking the interface removal, resulting in the following dmesg lines repeating every 10s: can: notifier: receive list not found for dev can0 can: notifier: receive list not found for dev can0 can: notifier: receive list not found for dev can0 unregister_netdevice: waiting for can0 to become free. Usage count = -1 Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> commit 92eb1d477145b2e7780b5002e856f70b8c3d74da Author: Jesse Gross <jesse(a)nicira.com> Date: Wed Nov 28 14:01:52 2012 -0800 openvswitch: Use RCU callback when detaching netdevices. Currently, each time a device is detached from an OVS datapath we call synchronize RCU before freeing associated data structures. However, if a bridge is deleted (which detaches all ports) when many devices are connected then there can be a long delay. This switches to use call_rcu() to group the cost together. Reported-by: Justin Pettit <jpettit(a)nicira.com> Signed-off-by: Jesse Gross <jesse(a)nicira.com> commit 3ac108006fd7f20cb8fc8ea2287f1497bcda00a1 Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Tue Nov 6 23:17:00 2012 +0100 pppoatm: take ATM socket lock in pppoatm_send() The pppoatm_send() does not take any lock that will prevent concurrent vcc_sendmsg(). This causes two problems: - there is no locking between checking the send queue size with atm_may_send() and incrementing sk_wmem_alloc, and the real queue size can be a little higher than sk_sndbuf - the vcc->sendmsg() can be called concurrently. I'm not sure if it's allowed. Some drivers (eni, nicstar, ...) seem to assume it will never happen. Now pppoatm_send() takes ATM socket lock, the same that is used in vcc_sendmsg() and other ATM socket functions. The pppoatm_send() is called with BH disabled, so bh_lock_sock() is used instead of lock_sock(). Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Cc: Chas Williams - CONTRACTOR <chas(a)cmf.nrl.navy.mil> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit e41faed9cde1acce657f75a0b19a1787e9850d3f Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Tue Nov 6 23:16:59 2012 +0100 pppoatm: fix module_put() race The pppoatm used module_put() during unassignment from vcc with hope that we have BKL. This assumption is no longer true. Now owner field in atmvcc is used to move this module_put() to vcc_destroy_socket(). Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit 3b1a914595f3f9beb9e38ff3ddc7bdafa092ba22 Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Tue Nov 6 23:16:58 2012 +0100 pppoatm: allow assign only on a connected socket The pppoatm does not check if used vcc is in connected state, causing an Oops in pppoatm_send() when vcc->send() is called on not fully connected socket. Now pppoatm can be assigned only on connected sockets; otherwise -EINVAL error is returned. Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Cc: Chas Williams - CONTRACTOR <chas(a)cmf.nrl.navy.mil> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> commit ec809bd817dfa1905283468e4c813684ed4efe78 Author: Krzysztof Mazur <krzysiek(a)podlesie.net> Date: Tue Nov 6 23:16:57 2012 +0100 atm: add owner of push() callback to atmvcc The atm is using atmvcc->push(vcc, NULL) callback to notify protocol that vcc will be closed and protocol must detach from it. This callback is usually used by protocol to decrement module usage count by module_put(), but it leaves small window then module is still used after module_put(). Now the owner of push() callback is kept in atmvcc and module_put(atmvcc->owner) is called after the protocol is detached from vcc. Signed-off-by: Krzysztof Mazur <krzysiek(a)podlesie.net> Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Acked-by: Chas Williams <chas(a)cmf.nrl.navy.mil> commit 39c7caebc94e851f58b84b54659156dd30522e8e Author: Ansis Atteka <aatteka(a)nicira.com> Date: Mon Nov 26 11:24:11 2012 -0800 openvswitch: add skb mark matching and set action This patch adds support for skb mark matching and set action. Signed-off-by: Ansis Atteka <aatteka(a)nicira.com> Signed-off-by: Jesse Gross <jesse(a)nicira.com> commit 404f2f1019c0293bd91dc1c03c8557ec97d9d104 Author: Shan Wei <davidshan(a)tencent.com> Date: Tue Nov 13 09:52:25 2012 +0800 net: openvswitch: use this_cpu_ptr per-cpu helper just use more faster this_cpu_ptr instead of per_cpu_ptr(p, smp_processor_id()); Signed-off-by: Shan Wei <davidshan(a)tencent.com> Reviewed-by: Christoph Lameter <cl(a)linux.com> Signed-off-by: Jesse Gross <jesse(a)nicira.com> commit 3fdbd1ce11e5c0d7cafbe44c942c5cad61113d7b Author: Ansis Atteka <aatteka(a)nicira.com> Date: Tue Nov 13 15:44:14 2012 -0800 openvswitch: add ipv6 'set' action This patch adds ipv6 set action functionality. It allows to change traffic class, flow label, hop-limit, ipv6 source and destination address fields. Signed-off-by: Ansis Atteka <aatteka(a)nicira.com> Signed-off-by: Jesse Gross <jesse(a)nicira.com> commit 9195bb8e381d81d5a315f911904cdf0cfcc919b8 Author: Ansis Atteka <aatteka(a)nicira.com> Date: Fri Nov 9 17:11:31 2012 -0800 ipv6: improve ipv6_find_hdr() to skip empty routing headers This patch prepares ipv6_find_hdr() function so that it could be able to skip routing headers, where segements_left is 0. This is required to handle multiple routing header case correctly when changing IPv6 addresses. Signed-off-by: Ansis Atteka <aatteka(a)nicira.com> Signed-off-by: Jesse Gross <jesse(a)nicira.com> commit f8f626754ebeca613cf1af2e6f890cfde0e74d5b Author: Jesse Gross <jesse(a)nicira.com> Date: Fri Nov 9 17:05:07 2012 -0800 ipv6: Move ipv6_find_hdr() out of Netfilter code. Open vSwitch will soon also use ipv6_find_hdr() so this moves it out of Netfilter-specific code into a more common location. Signed-off-by: Jesse Gross <jesse(a)nicira.com> commit c0618533815d8d92b270f03c11042ea53a8045d2 Author: Mehak Mahajan <mmahajan(a)nicira.com> Date: Fri Nov 2 14:14:31 2012 -0700 openvswitch: Process RARP packets with ethertype 0x8035 similar to ARP packets. With this commit, OVS will match the data in the RARP packets having ethertype 0x8035, in the same way as the data in the ARP packets. Signed-off-by: Mehak Mahajan <mmahajan(a)nicira.com> Signed-off-by: Jesse Gross <jesse(a)nicira.com> ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/next, created. v3.7-rc1-1634-g05d13fc
by postmaster＠open-mesh.org 05 Dec '12

05 Dec '12

The branch, merge/next has been created at 05d13fc3d3518d6125e28793f6db2b47198a1042 (commit) - Shortlog ------------------------------------------------------------ ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.7-rc1-1651-g4d8d1a8
by postmaster＠open-mesh.org 05 Dec '12

05 Dec '12

The following commit has been merged in the merge/master branch: commit 4d8d1a8243f025d06a7d5627b8575deb06d03624 Merge: 05d13fc3d3518d6125e28793f6db2b47198a1042 c13023b7d5f57494ebcd42ae4512afe0fc452383 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Dec 5 00:25:12 2012 +0100 Merge remote-tracking branch 'pkg/master' into merge/master Conflicts: net/batman-adv/compat.h diff --combined net/batman-adv/bat_iv_ogm.c index 9f3925a,83dfcb4..83dfcb4 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -183,7 -183,6 +183,6 @@@ static void batadv_iv_ogm_send_to_if(st /* adjust all flags and log packets */ while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len, batadv_ogm_packet->tt_num_changes)) { - /* we might have aggregated direct link packets with an * ordinary base packet */ @@@ -261,7 -260,6 +260,6 @@@ static void batadv_iv_ogm_emit(struct b */ if ((directlink && (batadv_ogm_packet->header.ttl == 1)) || (forw_packet->own && (forw_packet->if_incoming != primary_if))) { - /* FIXME: what about aggregated packets ? */ batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n", @@@ -325,7 -323,6 +323,6 @@@ batadv_iv_ogm_can_aggregate(const struc if (time_before(send_time, forw_packet->send_time) && time_after_eq(aggregation_end_time, forw_packet->send_time) && (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { - /* check aggregation compatibility * -> direct link packets are broadcasted on * their interface only @@@ -815,7 -812,6 +812,6 @@@ static int batadv_iv_ogm_calc_tq(struc rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_neigh_node->neigh_list, list) { - if (!batadv_compare_eth(tmp_neigh_node->addr, orig_neigh_node->orig)) continue; @@@ -949,7 -945,6 +945,6 @@@ batadv_iv_ogm_update_seqnos(const struc rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_node->neigh_list, list) { - is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, orig_node->last_real_seqno, seqno); @@@ -1033,7 -1028,7 +1028,7 @@@ static void batadv_iv_ogm_process(cons is_single_hop_neigh = true; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n", + "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %#.4x, changes %u, td %d, TTL %d, V %d, IDF %d)\n", ethhdr->h_source, if_incoming->net_dev->name, if_incoming->net_dev->dev_addr, batadv_ogm_packet->orig, batadv_ogm_packet->prev_sender, @@@ -1223,7 -1218,6 +1218,6 @@@ /* is single hop (direct) neighbor */ if (is_single_hop_neigh) { - /* mark direct link on incoming interface */ batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet, is_single_hop_neigh, diff --combined net/batman-adv/bridge_loop_avoidance.c index 5aebe93,724adf0..724adf0 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -235,7 -235,6 +235,6 @@@ batadv_bla_del_backbone_claims(struct b spin_lock_bh(list_lock); hlist_for_each_entry_safe(claim, node, node_tmp, head, hash_entry) { - if (claim->backbone_gw != backbone_gw) continue; @@@ -338,7 -337,6 +337,6 @@@ static void batadv_bla_send_claim(struc "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n", ethhdr->h_source, ethhdr->h_dest, vid); break; - } if (vid != -1) @@@ -539,7 -537,6 +537,6 @@@ static void batadv_bla_send_announce(st batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid, BATADV_CLAIM_TYPE_ANNOUNCE); - } /** @@@ -598,7 -595,6 +595,6 @@@ static void batadv_bla_add_claim(struc claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); batadv_backbone_gw_free_ref(claim->backbone_gw); - } /* set (new) backbone gw */ atomic_inc(&backbone_gw->refcount); @@@ -661,12 -657,12 +657,12 @@@ static int batadv_handle_announce(struc crc = ntohs(*((__be16 *)(&an_addr[4]))); batadv_dbg(BATADV_DBG_BLA, bat_priv, - "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %04x\n", + "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n", vid, backbone_gw->orig, crc); if (backbone_gw->crc != crc) { batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv, - "handle_announce(): CRC FAILED for %pM/%d (my = %04x, sent = %04x)\n", + "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n", backbone_gw->orig, backbone_gw->vid, backbone_gw->crc, crc); @@@ -835,7 -831,7 +831,7 @@@ static int batadv_check_claim_group(str /* if our mesh friends mac is bigger, use it for ourselves. */ if (ntohs(bla_dst->group) > ntohs(bla_dst_own->group)) { batadv_dbg(BATADV_DBG_BLA, bat_priv, - "taking other backbones claim group: %04x\n", + "taking other backbones claim group: %#.4x\n", ntohs(bla_dst->group)); bla_dst_own->group = bla_dst->group; } @@@ -1626,10 -1622,10 +1622,10 @@@ int batadv_bla_claim_table_seq_print_te primary_addr = primary_if->net_dev->dev_addr; seq_printf(seq, - "Claims announced for the mesh %s (orig %pM, group id %04x)\n", + "Claims announced for the mesh %s (orig %pM, group id %#.4x)\n", net_dev->name, primary_addr, ntohs(bat_priv->bla.claim_dest.group)); - seq_printf(seq, " %-17s %-5s %-17s [o] (%-4s)\n", + seq_printf(seq, " %-17s %-5s %-17s [o] (%-6s)\n", "Client", "VID", "Originator", "CRC"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -1638,7 -1634,7 +1634,7 @@@ hlist_for_each_entry_rcu(claim, node, head, hash_entry) { is_own = batadv_compare_eth(claim->backbone_gw->orig, primary_addr); - seq_printf(seq, " * %pM on % 5d by %pM [%c] (%04x)\n", + seq_printf(seq, " * %pM on % 5d by %pM [%c] (%#.4x)\n", claim->addr, claim->vid, claim->backbone_gw->orig, (is_own ? 'x' : ' '), @@@ -1672,10 -1668,10 +1668,10 @@@ int batadv_bla_backbone_table_seq_print primary_addr = primary_if->net_dev->dev_addr; seq_printf(seq, - "Backbones announced for the mesh %s (orig %pM, group id %04x)\n", + "Backbones announced for the mesh %s (orig %pM, group id %#.4x)\n", net_dev->name, primary_addr, ntohs(bat_priv->bla.claim_dest.group)); - seq_printf(seq, " %-17s %-5s %-9s (%-4s)\n", + seq_printf(seq, " %-17s %-5s %-9s (%-6s)\n", "Originator", "VID", "last seen", "CRC"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -1693,7 -1689,7 +1689,7 @@@ continue; seq_printf(seq, - " * %pM on % 5d % 4i.%03is (%04x)\n", + " * %pM on % 5d % 4i.%03is (%#.4x)\n", backbone_gw->orig, backbone_gw->vid, secs, msecs, backbone_gw->crc); } diff --combined net/batman-adv/debugfs.c index 6f58ddd,5136d32..5136d32 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@@ -164,7 -164,6 +164,6 @@@ static ssize_t batadv_log_read(struct f buf++; i++; - } spin_unlock_bh(&debug_log->lock); @@@ -397,10 -396,8 +396,8 @@@ err void batadv_debugfs_destroy(void) { - if (batadv_debugfs) { - debugfs_remove_recursive(batadv_debugfs); - batadv_debugfs = NULL; - } + debugfs_remove_recursive(batadv_debugfs); + batadv_debugfs = NULL; } int batadv_debugfs_add_meshif(struct net_device *dev) diff --combined net/batman-adv/main.h index 2f85577,0000000..d04b209 mode 100644,000000..100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -1,301 -1,0 +1,299 @@@ +/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + */ + +#ifndef _NET_BATMAN_ADV_MAIN_H_ +#define _NET_BATMAN_ADV_MAIN_H_ + +#define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ + "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>" +#define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" +#define BATADV_DRIVER_DEVICE "batman-adv" + +#ifndef BATADV_SOURCE_VERSION +#define BATADV_SOURCE_VERSION "2012.5.0" +#endif + +/* B.A.T.M.A.N. parameters */ + +#define BATADV_TQ_MAX_VALUE 255 +#define BATADV_JITTER 20 + +/* Time To Live of broadcast messages */ +#define BATADV_TTL 50 + +/* purge originators after time in seconds if no valid packet comes in + * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE + */ +#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ - #define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in milliseconds */ ++#define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */ +/* sliding packet range of received originator messages in sequence numbers + * (should be a multiple of our word size) + */ +#define BATADV_TQ_LOCAL_WINDOW_SIZE 64 +/* milliseconds we have to keep pending tt_req */ +#define BATADV_TT_REQUEST_TIMEOUT 3000 + +#define BATADV_TQ_GLOBAL_WINDOW_SIZE 5 +#define BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 +#define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 +#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1 + +/* number of OGMs sent with the last tt diff */ +#define BATADV_TT_OGM_APPEND_MAX 3 + +/* Time in which a client can roam at most ROAMING_MAX_COUNT times in + * milliseconds + */ +#define BATADV_ROAMING_MAX_TIME 20000 +#define BATADV_ROAMING_MAX_COUNT 5 + +#define BATADV_NO_FLAGS 0 + +#define BATADV_NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */ + +#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE) + +#define BATADV_LOG_BUF_LEN 8192 /* has to be a power of 2 */ + +/* msecs after which an ARP_REQUEST is sent in broadcast as fallback */ +#define ARP_REQ_DELAY 250 +/* numbers of originator to contact for any PUT/GET DHT operation */ +#define BATADV_DAT_CANDIDATES_NUM 3 + +#define BATADV_VIS_INTERVAL 5000 /* 5 seconds */ + +/* how much worse secondary interfaces may be to be considered as bonding + * candidates + */ +#define BATADV_BONDING_TQ_THRESHOLD 50 + +/* should not be bigger than 512 bytes or change the size of + * forw_packet->direct_link_flags + */ +#define BATADV_MAX_AGGREGATION_BYTES 512 +#define BATADV_MAX_AGGREGATION_MS 100 + +#define BATADV_BLA_PERIOD_LENGTH 10000 /* 10 seconds */ +#define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 3) +#define BATADV_BLA_CLAIM_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 10) +#define BATADV_BLA_WAIT_PERIODS 3 + +#define BATADV_DUPLIST_SIZE 16 +#define BATADV_DUPLIST_TIMEOUT 500 /* 500 ms */ +/* don't reset again within 30 seconds */ +#define BATADV_RESET_PROTECTION_MS 30000 +#define BATADV_EXPECTED_SEQNO_RANGE 65536 + +enum batadv_mesh_state { + BATADV_MESH_INACTIVE, + BATADV_MESH_ACTIVE, + BATADV_MESH_DEACTIVATING, +}; + +#define BATADV_BCAST_QUEUE_LEN 256 +#define BATADV_BATMAN_QUEUE_LEN 256 + +enum batadv_uev_action { + BATADV_UEV_ADD = 0, + BATADV_UEV_DEL, + BATADV_UEV_CHANGE, +}; + +enum batadv_uev_type { + BATADV_UEV_GW = 0, +}; + +#define BATADV_GW_THRESHOLD 50 + +#define BATADV_DAT_CANDIDATE_NOT_FOUND 0 +#define BATADV_DAT_CANDIDATE_ORIG 1 + +/* Debug Messages */ +#ifdef pr_fmt +#undef pr_fmt +#endif +/* Append 'batman-adv: ' before kernel messages */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +/* Kernel headers */ + +#include <linux/mutex.h> /* mutex */ +#include <linux/module.h> /* needed by all modules */ +#include <linux/netdevice.h> /* netdevice */ +#include <linux/etherdevice.h> /* ethernet address classification */ +#include <linux/if_ether.h> /* ethernet header */ +#include <linux/poll.h> /* poll_table */ +#include <linux/kthread.h> /* kernel threads */ +#include <linux/pkt_sched.h> /* schedule types */ +#include <linux/workqueue.h> /* workqueue */ +#include <linux/percpu.h> +#include <linux/slab.h> +#include <net/sock.h> /* struct sock */ +#include <linux/jiffies.h> +#include <linux/seq_file.h> +#include "types.h" + +extern char batadv_routing_algo[]; +extern struct list_head batadv_hardif_list; + +extern unsigned char batadv_broadcast_addr[]; +extern struct workqueue_struct *batadv_event_workqueue; + +int batadv_mesh_init(struct net_device *soft_iface); +void batadv_mesh_free(struct net_device *soft_iface); +int batadv_is_my_mac(const uint8_t *addr); +struct batadv_hard_iface * +batadv_seq_print_text_primary_if_get(struct seq_file *seq); +int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev); +int +batadv_recv_handler_register(uint8_t packet_type, + int (*recv_handler)(struct sk_buff *, + struct batadv_hard_iface *)); +void batadv_recv_handler_unregister(uint8_t packet_type); +int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); +int batadv_algo_select(struct batadv_priv *bat_priv, char *name); +int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); + +/** + * enum batadv_dbg_level - available log levels + * @BATADV_DBG_BATMAN: OGM and TQ computations related messages + * @BATADV_DBG_ROUTES: route added / changed / deleted + * @BATADV_DBG_TT: translation table messages + * @BATADV_DBG_BLA: bridge loop avoidance messages + * @BATADV_DBG_DAT: ARP snooping and DAT related messages + * @BATADV_DBG_ALL: the union of all the above log levels + */ +enum batadv_dbg_level { + BATADV_DBG_BATMAN = BIT(0), + BATADV_DBG_ROUTES = BIT(1), + BATADV_DBG_TT = BIT(2), + BATADV_DBG_BLA = BIT(3), + BATADV_DBG_DAT = BIT(4), + BATADV_DBG_ALL = 31, +}; + +#ifdef CONFIG_BATMAN_ADV_DEBUG +int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) +__printf(2, 3); + +#define batadv_dbg(type, bat_priv, fmt, arg...) \ + do { \ + if (atomic_read(&bat_priv->log_level) & type) \ + batadv_debug_log(bat_priv, fmt, ## arg);\ + } \ + while (0) +#else /* !CONFIG_BATMAN_ADV_DEBUG */ +__printf(3, 4) +static inline void batadv_dbg(int type __always_unused, + struct batadv_priv *bat_priv __always_unused, + const char *fmt __always_unused, ...) +{ +} +#endif + +#define batadv_info(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_info("%s: " fmt, _netdev->name, ## arg); \ + } while (0) +#define batadv_err(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_err("%s: " fmt, _netdev->name, ## arg); \ + } while (0) + +/* returns 1 if they are the same ethernet addr + * + * note: can't use compare_ether_addr() as it requires aligned memory + */ +static inline int batadv_compare_eth(const void *data1, const void *data2) +{ + return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); +} + +/** + * has_timed_out - compares current time (jiffies) and timestamp + timeout + * @timestamp: base value to compare with (in jiffies) + * @timeout: added to base value before comparing (in milliseconds) + * + * Returns true if current time is after timestamp + timeout + */ +static inline bool batadv_has_timed_out(unsigned long timestamp, + unsigned int timeout) +{ + return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout)); +} + +#define batadv_atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) + +/* Returns the smallest signed integer in two's complement with the sizeof x */ +#define batadv_smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) + +/* Checks if a sequence number x is a predecessor/successor of y. + * they handle overflows/underflows and can correctly check for a + * predecessor/successor unless the variable sequence number has grown by + * more then 2**(bitwidth(x)-1)-1. + * This means that for a uint8_t with the maximum value 255, it would think: + * - when adding nothing - it is neither a predecessor nor a successor + * - before adding more than 127 to the starting value - it is a predecessor, + * - when adding 128 - it is neither a predecessor nor a successor, + * - after adding more than 127 to the starting value - it is a successor + */ +#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \ + typeof(y) _d2 = (y); \ + typeof(x) _dummy = (_d1 - _d2); \ + (void) (&_d1 == &_d2); \ + _dummy > batadv_smallest_signed_int(_dummy); }) +#define batadv_seq_after(x, y) batadv_seq_before(y, x) + +/* Stop preemption on local cpu while incrementing the counter */ +static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, + size_t count) +{ - int cpu = get_cpu(); - per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; - put_cpu(); ++ this_cpu_add(bat_priv->bat_counters[idx], count); +} + +#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) + +/* Sum and return the cpu-local counters for index 'idx' */ +static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv, + size_t idx) +{ + uint64_t *counters, sum = 0; + int cpu; + + for_each_possible_cpu(cpu) { + counters = per_cpu_ptr(bat_priv->bat_counters, cpu); + sum += counters[idx]; + } + + return sum; +} + +#endif /* _NET_BATMAN_ADV_MAIN_H_ */ diff --combined net/batman-adv/originator.c index 8c32cf1,fa88b2b..fa88b2b --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -29,6 -29,9 +29,9 @@@ #include "soft-interface.h" #include "bridge_loop_avoidance.h" + /* hash class keys */ + static struct lock_class_key batadv_orig_hash_lock_class_key; + static void batadv_purge_orig(struct work_struct *work); static void batadv_start_purge_timer(struct batadv_priv *bat_priv) @@@ -57,6 -60,9 +60,9 @@@ int batadv_originator_init(struct batad if (!bat_priv->orig_hash) goto err; + batadv_hash_set_lock_class(bat_priv->orig_hash, + &batadv_orig_hash_lock_class_key); + batadv_start_purge_timer(bat_priv); return 0; @@@ -178,7 -184,6 +184,6 @@@ void batadv_originator_free(struct bata spin_lock_bh(list_lock); hlist_for_each_entry_safe(orig_node, node, node_tmp, head, hash_entry) { - hlist_del_rcu(node); batadv_orig_node_free_ref(orig_node); } @@@ -285,7 -290,6 +290,6 @@@ batadv_purge_orig_neighbors(struct bata /* for all neighbors towards this originator ... */ hlist_for_each_entry_safe(neigh_node, node, node_tmp, &orig_node->neigh_list, list) { - last_seen = neigh_node->last_seen; if_incoming = neigh_node->if_incoming; @@@ -293,7 -297,6 +297,6 @@@ (if_incoming->if_status == BATADV_IF_INACTIVE) || (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { - if ((if_incoming->if_status == BATADV_IF_INACTIVE) || (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) diff --combined net/batman-adv/routing.c index 1aa1722,db89238..db89238 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -80,7 -80,6 +80,6 @@@ static void _batadv_update_route(struc /* route added */ } else if ((!curr_router) && (neigh_node)) { - batadv_dbg(BATADV_DBG_ROUTES, bat_priv, "Adding route towards: %pM (via %pM)\n", orig_node->orig, neigh_node->addr); @@@ -172,7 -171,6 +171,6 @@@ void batadv_bonding_candidate_add(struc */ hlist_for_each_entry_rcu(tmp_neigh_node, node, &orig_node->neigh_list, list) { - if (tmp_neigh_node == neigh_node) continue; @@@ -836,7 -834,6 +834,6 @@@ static int batadv_route_unicast_packet( if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG && batadv_frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) { - ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); if (ret == NET_RX_DROP) @@@ -1103,7 -1100,6 +1100,6 @@@ int batadv_recv_ucast_frag_packet(struc /* packet for me */ if (batadv_is_my_mac(unicast_packet->dest)) { - ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); if (ret == NET_RX_DROP) diff --combined net/batman-adv/send.c index 4425af9,89810ce..89810ce --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@@ -330,7 -330,6 +330,6 @@@ batadv_purge_outstanding_packets(struc spin_lock_bh(&bat_priv->forw_bcast_list_lock); hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, &bat_priv->forw_bcast_list, list) { - /* if purge_outstanding_packets() was called with an argument * we delete only packets belonging to the given interface */ @@@ -357,7 -356,6 +356,6 @@@ spin_lock_bh(&bat_priv->forw_bat_list_lock); hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, &bat_priv->forw_bat_list, list) { - /* if purge_outstanding_packets() was called with an argument * we delete only packets belonging to the given interface */ diff --combined net/batman-adv/soft-interface.c index 6b548fd,adafa96..adafa96 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -181,7 -181,8 +181,8 @@@ static int batadv_interface_tx(struct s goto dropped; /* Register the client MAC in the transtable */ - batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); + if (!is_multicast_ether_addr(ethhdr->h_source)) + batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); /* don't accept stp packets. STP does not help in meshes. * better use the bridge loop avoidance ... @@@ -480,7 -481,9 +481,9 @@@ struct net_device *batadv_softif_create atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); + #ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bridge_loop_avoidance, 0); + #endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_set(&bat_priv->distributed_arp_table, 1); #endif diff --combined net/batman-adv/translation-table.c index 22457a7,d4b27b6..d4b27b6 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -29,6 -29,10 +29,10 @@@ #include <linux/crc16.h> + /* hash class keys */ + static struct lock_class_key batadv_tt_local_hash_lock_class_key; + static struct lock_class_key batadv_tt_global_hash_lock_class_key; + static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, struct batadv_orig_node *orig_node); static void batadv_tt_purge(struct work_struct *work); @@@ -112,7 -116,6 +116,6 @@@ batadv_tt_global_hash_find(struct batad struct batadv_tt_global_entry, common); return tt_global_entry; - } static void @@@ -235,6 -238,9 +238,9 @@@ static int batadv_tt_local_init(struct if (!bat_priv->tt.local_hash) return -ENOMEM; + batadv_hash_set_lock_class(bat_priv->tt.local_hash, + &batadv_tt_local_hash_lock_class_key); + return 0; } @@@ -249,7 -255,6 +255,6 @@@ static void batadv_tt_global_free(struc batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt, batadv_choose_orig, tt_global->common.addr); batadv_tt_global_entry_free_ref(tt_global); - } void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, @@@ -305,7 -310,11 +310,11 @@@ (uint8_t)atomic_read(&bat_priv->tt.vn)); memcpy(tt_local->common.addr, addr, ETH_ALEN); - tt_local->common.flags = BATADV_NO_FLAGS; + /* The local entry has to be marked as NEW to avoid to send it in + * a full table response going out before the next ttvn increment + * (consistency check) + */ + tt_local->common.flags = BATADV_TT_CLIENT_NEW; if (batadv_is_wifi_iface(ifindex)) tt_local->common.flags |= BATADV_TT_CLIENT_WIFI; atomic_set(&tt_local->common.refcount, 2); @@@ -316,12 -325,6 +325,6 @@@ if (batadv_compare_eth(addr, soft_iface->dev_addr)) tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE; - /* The local entry has to be marked as NEW to avoid to send it in - * a full table response going out before the next ttvn increment - * (consistency check) - */ - tt_local->common.flags |= BATADV_TT_CLIENT_NEW; - hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, batadv_choose_orig, &tt_local->common, &tt_local->common.hash_entry); @@@ -472,18 -475,27 +475,27 @@@ int batadv_tt_local_seq_print_text(stru struct batadv_priv *bat_priv = netdev_priv(net_dev); struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common_entry; + struct batadv_tt_local_entry *tt_local; struct batadv_hard_iface *primary_if; struct hlist_node *node; struct hlist_head *head; uint32_t i; + int last_seen_secs; + int last_seen_msecs; + unsigned long last_seen_jiffies; + bool no_purge; + uint16_t np_flag = BATADV_TT_CLIENT_NOPURGE; primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) goto out; seq_printf(seq, - "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n", - net_dev->name, (uint8_t)atomic_read(&bat_priv->tt.vn)); + "Locally retrieved addresses (from %s) announced via TT (TTVN: %u CRC: %#.4x):\n", + net_dev->name, (uint8_t)atomic_read(&bat_priv->tt.vn), + bat_priv->tt.local_crc); + seq_printf(seq, " %-13s %-7s %-10s\n", "Client", "Flags", + "Last seen"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -491,18 -503,29 +503,29 @@@ rcu_read_lock(); hlist_for_each_entry_rcu(tt_common_entry, node, head, hash_entry) { - seq_printf(seq, " * %pM [%c%c%c%c%c]\n", + tt_local = container_of(tt_common_entry, + struct batadv_tt_local_entry, + common); + last_seen_jiffies = jiffies - tt_local->last_seen; + last_seen_msecs = jiffies_to_msecs(last_seen_jiffies); + last_seen_secs = last_seen_msecs / 1000; + last_seen_msecs = last_seen_msecs % 1000; + + no_purge = tt_common_entry->flags & np_flag; + + seq_printf(seq, " * %pM [%c%c%c%c%c] %3u.%03u\n", tt_common_entry->addr, (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_NOPURGE ? 'P' : '.'), + no_purge ? 'P' : '.', (tt_common_entry->flags & BATADV_TT_CLIENT_NEW ? 'N' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & - BATADV_TT_CLIENT_WIFI ? 'W' : '.')); + BATADV_TT_CLIENT_WIFI ? 'W' : '.'), + no_purge ? last_seen_secs : 0, + no_purge ? last_seen_msecs : 0); } rcu_read_unlock(); } @@@ -627,7 -650,6 +650,6 @@@ static void batadv_tt_local_purge(struc batadv_tt_local_purge_list(bat_priv, head); spin_unlock_bh(list_lock); } - } static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) @@@ -676,6 -698,9 +698,9 @@@ static int batadv_tt_global_init(struc if (!bat_priv->tt.global_hash) return -ENOMEM; + batadv_hash_set_lock_class(bat_priv->tt.global_hash, + &batadv_tt_global_hash_lock_class_key); + return 0; } @@@ -967,10 -992,11 +992,11 @@@ batadv_tt_global_print_entry(struct bat best_entry = batadv_transtable_best_orig(tt_global_entry); if (best_entry) { last_ttvn = atomic_read(&best_entry->orig_node->last_ttvn); - seq_printf(seq, " %c %pM (%3u) via %pM (%3u) [%c%c%c]\n", + seq_printf(seq, + " %c %pM (%3u) via %pM (%3u) (%#.4x) [%c%c%c]\n", '*', tt_global_entry->common.addr, best_entry->ttvn, best_entry->orig_node->orig, - last_ttvn, + last_ttvn, best_entry->orig_node->tt_crc, (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.')); @@@ -1012,8 -1038,9 +1038,9 @@@ int batadv_tt_global_seq_print_text(str seq_printf(seq, "Globally announced TT entries received via the mesh %s\n", net_dev->name); - seq_printf(seq, " %-13s %s %-15s %s %s\n", - "Client", "(TTVN)", "Originator", "(Curr TTVN)", "Flags"); + seq_printf(seq, " %-13s %s %-15s %s (%-6s) %s\n", + "Client", "(TTVN)", "Originator", "(Curr TTVN)", "CRC", + "Flags"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -1049,7 -1076,6 +1076,6 @@@ batadv_tt_global_del_orig_list(struct b batadv_tt_orig_list_entry_free_ref(orig_entry); } spin_unlock_bh(&tt_global_entry->list_lock); - } static void @@@ -1825,7 -1851,6 +1851,6 @@@ out if (!ret) kfree_skb(skb); return ret; - } static bool @@@ -2352,7 -2377,6 +2377,6 @@@ static void batadv_tt_local_purge_pendi } spin_unlock_bh(list_lock); } - } static int batadv_tt_commit_changes(struct batadv_priv *bat_priv, @@@ -2496,7 -2520,7 +2520,7 @@@ void batadv_tt_update_orig(struct batad orig_node->tt_crc != tt_crc) { request_table: batadv_dbg(BATADV_DBG_TT, bat_priv, - "TT inconsistency for %pM. Need to retrieve the correct information (ttvn: %u last_ttvn: %u crc: %u last_crc: %u num_changes: %u)\n", + "TT inconsistency for %pM. Need to retrieve the correct information (ttvn: %u last_ttvn: %u crc: %#.4x last_crc: %#.4x num_changes: %u)\n", orig_node->orig, ttvn, orig_ttvn, tt_crc, orig_node->tt_crc, tt_num_changes); batadv_send_tt_request(bat_priv, orig_node, ttvn, @@@ -2549,7 -2573,6 +2573,6 @@@ bool batadv_tt_local_client_is_roaming( batadv_tt_local_entry_free_ref(tt_local_entry); out: return ret; - } bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, diff --combined net/batman-adv/types.h index ae9ac9a,030ce41..030ce41 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -273,7 -273,9 +273,9 @@@ struct batadv_priv atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */ atomic_t ap_isolation; /* boolean */ + #ifdef CONFIG_BATMAN_ADV_BLA atomic_t bridge_loop_avoidance; /* boolean */ + #endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_t distributed_arp_table; /* boolean */ #endif diff --combined net/batman-adv/unicast.c index 10aff49,f56bccf..f56bccf --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@@ -133,7 -133,6 +133,6 @@@ batadv_frag_search_packet(struct list_h is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); list_for_each_entry(tfp, head, list) { - if (!tfp->skb) continue; @@@ -162,7 -161,6 +161,6 @@@ void batadv_frag_list_free(struct list_ struct batadv_frag_packet_list_entry *pf, *tmp_pf; if (!list_empty(head)) { - list_for_each_entry_safe(pf, tmp_pf, head, list) { kfree_skb(pf->skb); list_del(&pf->list); diff --combined net/batman-adv/vis.c index 0f65a9d,60eb9b7..60eb9b7 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@@ -28,6 -28,9 +28,9 @@@ #define BATADV_MAX_VIS_PACKET_SIZE 1000 + /* hash class keys */ + static struct lock_class_key batadv_vis_hash_lock_class_key; + static void batadv_start_vis_timer(struct batadv_priv *bat_priv); /* free the info */ @@@ -852,6 -855,9 +855,9 @@@ int batadv_vis_init(struct batadv_priv goto err; } + batadv_hash_set_lock_class(bat_priv->vis.hash, + &batadv_vis_hash_lock_class_key); + bat_priv->vis.my_info = kmalloc(BATADV_MAX_VIS_PACKET_SIZE, GFP_ATOMIC); if (!bat_priv->vis.my_info) goto err; -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.7-rc8, created. v3.7-rc8
by postmaster＠open-mesh.org 03 Dec '12

03 Dec '12

The annotated tag, v3.7-rc8 has been created at 61cbb5be523d9b12da6596d5db90965d6ecd70d4 (tag) tagging b69f0859dc8e633c5d8c06845811588fe17e68b3 (commit) replaces v3.7-rc7 tagged by Linus Torvalds on Mon Dec 3 11:23:47 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.7-rc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQvPxHAAoJEHm+PkMAQRiGkFUIAJz761Kp4J4Nj/wrv5ZHGQso MHRbzMkSfRNz6lGCkgxS61ydYKtrV2vuE6VH8HriGlLkI8Lj7MaQTXvYSdj/O0zy yV/2H5R3s7n5JZTw3g3eOf3K33tL6xhwd4tYHI7QHjdzSzQyaNhuUuNhxrlT95iv twNetm0tyhpf76TurRzF14hLUaShVRXT/FrqWK9wgmGjg7Ij0xp+UFNkeUGUwbeF 3HMJ98fdd0VD/W8qF5GZr3USks4C+NKtXEya8zQKc59XumKCiRJZmbE6JsJlp+OP CsHs7ZaNlInvPcKTFzkNs8ThYWC/NHBqLO5tX5UphW4qFSS39EmHd8igrwXLPaI= =RS1F -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: don't compile the BLA switch if not requested (c13023b)
by postmaster＠open-mesh.org 01 Dec '12

01 Dec '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c13023b7d5f57494ebcd42ae4512afe0fc452383 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Nov 26 01:27:29 2012 +0100 batman-adv: don't compile the BLA switch if not requested When the Bridge Loop Avoidance component is not compiled-in, its boolean switch should be not compiled as well. This patch surrounds the switch with a proper ifdef. This behaviour was introduced by 9fd6b0615b5499b270d39a92b8790e206cf75833 ("batman-adv: add bridge loop avoidance compile option") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- c13023b7d5f57494ebcd42ae4512afe0fc452383 soft-interface.c | 2 ++ types.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index fcf8acc..adafa96 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -481,7 +481,9 @@ struct net_device *batadv_softif_create(const char *name) atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); +#ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bridge_loop_avoidance, 0); +#endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_set(&bat_priv->distributed_arp_table, 1); #endif diff --git a/types.h b/types.h index ae9ac9a..030ce41 100644 --- a/types.h +++ b/types.h @@ -273,7 +273,9 @@ struct batadv_priv { atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */ atomic_t ap_isolation; /* boolean */ +#ifdef CONFIG_BATMAN_ADV_BLA atomic_t bridge_loop_avoidance; /* boolean */ +#endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_t distributed_arp_table; /* boolean */ #endif

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2012