mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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: Bluetooth: Fix crash with incoming L2CAP connections Bluetooth: Fix regression in L2CAP connection procedure gianfar: rx parser r6040: only disable RX interrupt if napi_schedule_prep is successful net: remove NETIF_F_ALL_TX_OFFLOADS net: sctp: fix checksum marking for outgoing packets
This commit is contained in:
commit
3d68bd0010
8 changed files with 47 additions and 34 deletions
|
@ -1428,9 +1428,9 @@ static u32 bond_fix_features(struct net_device *dev, u32 features)
|
|||
return features;
|
||||
}
|
||||
|
||||
#define BOND_VLAN_FEATURES (NETIF_F_ALL_TX_OFFLOADS | \
|
||||
NETIF_F_SOFT_FEATURES | \
|
||||
NETIF_F_LRO)
|
||||
#define BOND_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \
|
||||
NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \
|
||||
NETIF_F_HIGHDMA | NETIF_F_LRO)
|
||||
|
||||
static void bond_compute_features(struct bonding *bond)
|
||||
{
|
||||
|
|
|
@ -2289,6 +2289,23 @@ static int gfar_set_mac_address(struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Check if rx parser should be activated */
|
||||
void gfar_check_rx_parser_mode(struct gfar_private *priv)
|
||||
{
|
||||
struct gfar __iomem *regs;
|
||||
u32 tempval;
|
||||
|
||||
regs = priv->gfargrp[0].regs;
|
||||
|
||||
tempval = gfar_read(®s->rctrl);
|
||||
/* If parse is no longer required, then disable parser */
|
||||
if (tempval & RCTRL_REQ_PARSER)
|
||||
tempval |= RCTRL_PRSDEP_INIT;
|
||||
else
|
||||
tempval &= ~RCTRL_PRSDEP_INIT;
|
||||
gfar_write(®s->rctrl, tempval);
|
||||
}
|
||||
|
||||
|
||||
/* Enables and disables VLAN insertion/extraction */
|
||||
static void gfar_vlan_rx_register(struct net_device *dev,
|
||||
|
@ -2325,12 +2342,9 @@ static void gfar_vlan_rx_register(struct net_device *dev,
|
|||
/* Disable VLAN tag extraction */
|
||||
tempval = gfar_read(®s->rctrl);
|
||||
tempval &= ~RCTRL_VLEX;
|
||||
/* If parse is no longer required, then disable parser */
|
||||
if (tempval & RCTRL_REQ_PARSER)
|
||||
tempval |= RCTRL_PRSDEP_INIT;
|
||||
else
|
||||
tempval &= ~RCTRL_PRSDEP_INIT;
|
||||
gfar_write(®s->rctrl, tempval);
|
||||
|
||||
gfar_check_rx_parser_mode(priv);
|
||||
}
|
||||
|
||||
gfar_change_mtu(dev, dev->mtu);
|
||||
|
|
|
@ -274,7 +274,7 @@ extern const char gfar_driver_version[];
|
|||
#define RCTRL_PROM 0x00000008
|
||||
#define RCTRL_EMEN 0x00000002
|
||||
#define RCTRL_REQ_PARSER (RCTRL_VLEX | RCTRL_IPCSEN | \
|
||||
RCTRL_TUCSEN)
|
||||
RCTRL_TUCSEN | RCTRL_FILREN)
|
||||
#define RCTRL_CHECKSUMMING (RCTRL_IPCSEN | RCTRL_TUCSEN | \
|
||||
RCTRL_PRSDEP_INIT)
|
||||
#define RCTRL_EXTHASH (RCTRL_GHTX)
|
||||
|
@ -1156,6 +1156,7 @@ extern void gfar_configure_coalescing(struct gfar_private *priv,
|
|||
unsigned long tx_mask, unsigned long rx_mask);
|
||||
void gfar_init_sysfs(struct net_device *dev);
|
||||
int gfar_set_features(struct net_device *dev, u32 features);
|
||||
extern void gfar_check_rx_parser_mode(struct gfar_private *priv);
|
||||
|
||||
extern const struct ethtool_ops gfar_ethtool_ops;
|
||||
|
||||
|
|
|
@ -677,9 +677,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
|
|||
if (status & RX_FIFO_FULL)
|
||||
dev->stats.rx_fifo_errors++;
|
||||
|
||||
/* Mask off RX interrupt */
|
||||
misr &= ~RX_INTS;
|
||||
napi_schedule(&lp->napi);
|
||||
if (likely(napi_schedule_prep(&lp->napi))) {
|
||||
/* Mask off RX interrupt */
|
||||
misr &= ~RX_INTS;
|
||||
__napi_schedule(&lp->napi);
|
||||
}
|
||||
}
|
||||
|
||||
/* TX interrupt request */
|
||||
|
|
|
@ -1097,12 +1097,6 @@ struct net_device {
|
|||
#define NETIF_F_ALL_FCOE (NETIF_F_FCOE_CRC | NETIF_F_FCOE_MTU | \
|
||||
NETIF_F_FSO)
|
||||
|
||||
#define NETIF_F_ALL_TX_OFFLOADS (NETIF_F_ALL_CSUM | NETIF_F_SG | \
|
||||
NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \
|
||||
NETIF_F_HIGHDMA | \
|
||||
NETIF_F_SCTP_CSUM | \
|
||||
NETIF_F_ALL_FCOE)
|
||||
|
||||
/*
|
||||
* If one device supports one of these features, then enable them
|
||||
* for all in netdev_increment_features.
|
||||
|
|
|
@ -528,7 +528,11 @@ static int vlan_dev_init(struct net_device *dev)
|
|||
(1<<__LINK_STATE_DORMANT))) |
|
||||
(1<<__LINK_STATE_PRESENT);
|
||||
|
||||
dev->hw_features = NETIF_F_ALL_TX_OFFLOADS;
|
||||
dev->hw_features = NETIF_F_ALL_CSUM | NETIF_F_SG |
|
||||
NETIF_F_FRAGLIST | NETIF_F_ALL_TSO |
|
||||
NETIF_F_HIGHDMA | NETIF_F_SCTP_CSUM |
|
||||
NETIF_F_ALL_FCOE;
|
||||
|
||||
dev->features |= real_dev->vlan_features | NETIF_F_LLTX;
|
||||
dev->gso_max_size = real_dev->gso_max_size;
|
||||
|
||||
|
|
|
@ -620,7 +620,8 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
|
|||
struct sock *parent = bt_sk(sk)->parent;
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_PEND);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
|
||||
parent->sk_data_ready(parent, 0);
|
||||
if (parent)
|
||||
parent->sk_data_ready(parent, 0);
|
||||
|
||||
} else {
|
||||
sk->sk_state = BT_CONFIG;
|
||||
|
@ -2323,8 +2324,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
|
|||
|
||||
sk = chan->sk;
|
||||
|
||||
if ((bt_sk(sk)->defer_setup && sk->sk_state != BT_CONNECT2) ||
|
||||
(!bt_sk(sk)->defer_setup && sk->sk_state != BT_CONFIG)) {
|
||||
if (sk->sk_state != BT_CONFIG && sk->sk_state != BT_CONNECT2) {
|
||||
struct l2cap_cmd_rej rej;
|
||||
|
||||
rej.reason = cpu_to_le16(0x0002);
|
||||
|
@ -4010,7 +4010,8 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
|
|||
struct sock *parent = bt_sk(sk)->parent;
|
||||
res = L2CAP_CR_PEND;
|
||||
stat = L2CAP_CS_AUTHOR_PEND;
|
||||
parent->sk_data_ready(parent, 0);
|
||||
if (parent)
|
||||
parent->sk_data_ready(parent, 0);
|
||||
} else {
|
||||
sk->sk_state = BT_CONFIG;
|
||||
res = L2CAP_CR_SUCCESS;
|
||||
|
|
|
@ -500,23 +500,20 @@ int sctp_packet_transmit(struct sctp_packet *packet)
|
|||
* Note: Adler-32 is no longer applicable, as has been replaced
|
||||
* by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
|
||||
*/
|
||||
if (!sctp_checksum_disable &&
|
||||
!(dst->dev->features & (NETIF_F_NO_CSUM | NETIF_F_SCTP_CSUM))) {
|
||||
__u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
|
||||
if (!sctp_checksum_disable) {
|
||||
if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) {
|
||||
__u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
|
||||
|
||||
/* 3) Put the resultant value into the checksum field in the
|
||||
* common header, and leave the rest of the bits unchanged.
|
||||
*/
|
||||
sh->checksum = sctp_end_cksum(crc32);
|
||||
} else {
|
||||
if (dst->dev->features & NETIF_F_SCTP_CSUM) {
|
||||
/* 3) Put the resultant value into the checksum field in the
|
||||
* common header, and leave the rest of the bits unchanged.
|
||||
*/
|
||||
sh->checksum = sctp_end_cksum(crc32);
|
||||
} else {
|
||||
/* no need to seed pseudo checksum for SCTP */
|
||||
nskb->ip_summed = CHECKSUM_PARTIAL;
|
||||
nskb->csum_start = (skb_transport_header(nskb) -
|
||||
nskb->head);
|
||||
nskb->csum_offset = offsetof(struct sctphdr, checksum);
|
||||
} else {
|
||||
nskb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue