Staging
v0.8.1
v0.8.1
https://github.com/torvalds/linux
Revision ca749bbb108c24a876014c804f9777c545be4d59 authored by Marcelo Ricardo Leitner on 18 November 2019, 12:46:09 UTC, committed by David S. Miller on 19 November 2019, 01:25:36 UTC
Commit eec4844fae7c ("proc/sysctl: add shared variables for range check") did: - .extra2 = &two, + .extra2 = SYSCTL_ONE, here, which doesn't seem to be intentional, given the changelog. This patch restores it to the previous, as the value of 2 still makes sense (used in fib_multipath_hash()). Fixes: eec4844fae7c ("proc/sysctl: add shared variables for range check") Cc: Matteo Croce <mcroce@redhat.com> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Acked-by: Matteo Croce <mcroce@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 39c68b3
Tip revision: ca749bbb108c24a876014c804f9777c545be4d59 authored by Marcelo Ricardo Leitner on 18 November 2019, 12:46:09 UTC
net/ipv4: fix sysctl max for fib_multipath_hash_policy
net/ipv4: fix sysctl max for fib_multipath_hash_policy
Tip revision: ca749bb
fjes.h
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* FUJITSU Extended Socket Network Device driver
* Copyright (c) 2015 FUJITSU LIMITED
*/
#ifndef FJES_H_
#define FJES_H_
#include <linux/acpi.h>
#include "fjes_hw.h"
#define FJES_ACPI_SYMBOL "Extended Socket"
#define FJES_MAX_QUEUES 1
#define FJES_TX_RETRY_INTERVAL (20 * HZ)
#define FJES_TX_RETRY_TIMEOUT (100)
#define FJES_TX_TX_STALL_TIMEOUT (FJES_TX_RETRY_INTERVAL / 2)
#define FJES_OPEN_ZONE_UPDATE_WAIT (300) /* msec */
#define FJES_IRQ_WATCH_DELAY (HZ)
/* board specific private data structure */
struct fjes_adapter {
struct net_device *netdev;
struct platform_device *plat_dev;
struct napi_struct napi;
struct rtnl_link_stats64 stats64;
unsigned int tx_retry_count;
unsigned long tx_start_jiffies;
unsigned long rx_last_jiffies;
bool unset_rx_last;
struct work_struct force_close_task;
bool force_reset;
bool open_guard;
bool irq_registered;
struct workqueue_struct *txrx_wq;
struct workqueue_struct *control_wq;
struct work_struct tx_stall_task;
struct work_struct raise_intr_rxdata_task;
struct work_struct unshare_watch_task;
unsigned long unshare_watch_bitmask;
struct delayed_work interrupt_watch_task;
bool interrupt_watch_enable;
struct fjes_hw hw;
#ifdef CONFIG_DEBUG_FS
struct dentry *dbg_adapter;
#endif
};
extern char fjes_driver_name[];
extern char fjes_driver_version[];
extern const u32 fjes_support_mtu[];
void fjes_set_ethtool_ops(struct net_device *);
#ifdef CONFIG_DEBUG_FS
void fjes_dbg_adapter_init(struct fjes_adapter *adapter);
void fjes_dbg_adapter_exit(struct fjes_adapter *adapter);
void fjes_dbg_init(void);
void fjes_dbg_exit(void);
#else
static inline void fjes_dbg_adapter_init(struct fjes_adapter *adapter) {}
static inline void fjes_dbg_adapter_exit(struct fjes_adapter *adapter) {}
static inline void fjes_dbg_init(void) {}
static inline void fjes_dbg_exit(void) {}
#endif /* CONFIG_DEBUG_FS */
#endif /* FJES_H_ */
Computing file changes ...