Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net: Change netdev_fix_features messages loglevel
vmxnet3: Fix inconsistent LRO state after initialization
sfc: Fix oops in register dump after mapping change
IPVS: fix netns if reading ip_vs_* procfs entries
bridge: fix forwarding of IPv6
+24
-20
+7
drivers/net/sfc/nic.c
+7
drivers/net/sfc/nic.c
···
1937
1937
1938
1938
size = min_t(size_t, table->step, 16);
1939
1939
1940
+
if (table->offset >= efx->type->mem_map_size) {
1941
+
/* No longer mapped; return dummy data */
1942
+
memcpy(buf, "\xde\xc0\xad\xde", 4);
1943
+
buf += table->rows * size;
1944
+
continue;
1945
+
}
1946
+
1940
1947
for (i = 0; i < table->rows; i++) {
1941
1948
switch (table->step) {
1942
1949
case 4: /* 32-bit register or SRAM */
+3
drivers/net/vmxnet3/vmxnet3_ethtool.c
+3
drivers/net/vmxnet3/vmxnet3_ethtool.c
···
311
311
/* toggle the LRO feature*/
312
312
netdev->features ^= NETIF_F_LRO;
313
313
314
+
/* Update private LRO flag */
315
+
adapter->lro = lro_requested;
316
+
314
317
/* update harware LRO capability accordingly */
315
318
if (lro_requested)
316
319
adapter->shared->devRead.misc.uptFeatures |=
+8
-14
net/core/dev.c
+8
-14
net/core/dev.c
···
5186
5186
/* Fix illegal checksum combinations */
5187
5187
if ((features & NETIF_F_HW_CSUM) &&
5188
5188
(features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {
5189
-
netdev_info(dev, "mixed HW and IP checksum settings.\n");
5189
+
netdev_warn(dev, "mixed HW and IP checksum settings.\n");
5190
5190
features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
5191
5191
}
5192
5192
5193
5193
if ((features & NETIF_F_NO_CSUM) &&
5194
5194
(features & (NETIF_F_HW_CSUM|NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {
5195
-
netdev_info(dev, "mixed no checksumming and other settings.\n");
5195
+
netdev_warn(dev, "mixed no checksumming and other settings.\n");
5196
5196
features &= ~(NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM|NETIF_F_HW_CSUM);
5197
5197
}
5198
5198
5199
5199
/* Fix illegal SG+CSUM combinations. */
5200
5200
if ((features & NETIF_F_SG) &&
5201
5201
!(features & NETIF_F_ALL_CSUM)) {
5202
-
netdev_info(dev,
5203
-
"Dropping NETIF_F_SG since no checksum feature.\n");
5202
+
netdev_dbg(dev,
5203
+
"Dropping NETIF_F_SG since no checksum feature.\n");
5204
5204
features &= ~NETIF_F_SG;
5205
5205
}
5206
5206
5207
5207
/* TSO requires that SG is present as well. */
5208
5208
if ((features & NETIF_F_ALL_TSO) && !(features & NETIF_F_SG)) {
5209
-
netdev_info(dev, "Dropping TSO features since no SG feature.\n");
5209
+
netdev_dbg(dev, "Dropping TSO features since no SG feature.\n");
5210
5210
features &= ~NETIF_F_ALL_TSO;
5211
5211
}
5212
5212
···
5216
5216
5217
5217
/* Software GSO depends on SG. */
5218
5218
if ((features & NETIF_F_GSO) && !(features & NETIF_F_SG)) {
5219
-
netdev_info(dev, "Dropping NETIF_F_GSO since no SG feature.\n");
5219
+
netdev_dbg(dev, "Dropping NETIF_F_GSO since no SG feature.\n");
5220
5220
features &= ~NETIF_F_GSO;
5221
5221
}
5222
5222
···
5226
5226
if (!((features & NETIF_F_GEN_CSUM) ||
5227
5227
(features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))
5228
5228
== (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) {
5229
-
netdev_info(dev,
5229
+
netdev_dbg(dev,
5230
5230
"Dropping NETIF_F_UFO since no checksum offload features.\n");
5231
5231
features &= ~NETIF_F_UFO;
5232
5232
}
5233
5233
5234
5234
if (!(features & NETIF_F_SG)) {
5235
-
netdev_info(dev,
5235
+
netdev_dbg(dev,
5236
5236
"Dropping NETIF_F_UFO since no NETIF_F_SG feature.\n");
5237
5237
features &= ~NETIF_F_UFO;
5238
5238
}
···
5413
5413
dev->hw_features |= NETIF_F_SOFT_FEATURES;
5414
5414
dev->features |= NETIF_F_SOFT_FEATURES;
5415
5415
dev->wanted_features = dev->features & dev->hw_features;
5416
-
5417
-
/* Avoid warning from netdev_fix_features() for GSO without SG */
5418
-
if (!(dev->wanted_features & NETIF_F_SG)) {
5419
-
dev->wanted_features &= ~NETIF_F_GSO;
5420
-
dev->features &= ~NETIF_F_GSO;
5421
-
}
5422
5416
5423
5417
/* Enable GRO and NETIF_F_HIGHDMA for vlans by default,
5424
5418
* vlan_dev_init() will do the dev->features check, so these features
+1
-1
net/netfilter/ipvs/ip_vs_app.c
+1
-1
net/netfilter/ipvs/ip_vs_app.c
+2
-2
net/netfilter/ipvs/ip_vs_conn.c
+2
-2
net/netfilter/ipvs/ip_vs_conn.c
···
1046
1046
.open = ip_vs_conn_open,
1047
1047
.read = seq_read,
1048
1048
.llseek = seq_lseek,
1049
-
.release = seq_release,
1049
+
.release = seq_release_net,
1050
1050
};
1051
1051
1052
1052
static const char *ip_vs_origin_name(unsigned flags)
···
1114
1114
.open = ip_vs_conn_sync_open,
1115
1115
.read = seq_read,
1116
1116
.llseek = seq_lseek,
1117
-
.release = seq_release,
1117
+
.release = seq_release_net,
1118
1118
};
1119
1119
1120
1120
#endif
+3
-3
net/netfilter/ipvs/ip_vs_ctl.c
+3
-3
net/netfilter/ipvs/ip_vs_ctl.c
···
2066
2066
.open = ip_vs_info_open,
2067
2067
.read = seq_read,
2068
2068
.llseek = seq_lseek,
2069
-
.release = seq_release_private,
2069
+
.release = seq_release_net,
2070
2070
};
2071
2071
2072
2072
#endif
···
2109
2109
.open = ip_vs_stats_seq_open,
2110
2110
.read = seq_read,
2111
2111
.llseek = seq_lseek,
2112
-
.release = single_release,
2112
+
.release = single_release_net,
2113
2113
};
2114
2114
2115
2115
static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)
···
2178
2178
.open = ip_vs_stats_percpu_seq_open,
2179
2179
.read = seq_read,
2180
2180
.llseek = seq_lseek,
2181
-
.release = single_release,
2181
+
.release = single_release_net,
2182
2182
};
2183
2183
#endif
2184
2184