mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
Merge commit 'nbd/master' into xburst
This commit is contained in:
@@ -434,7 +434,7 @@
|
||||
if (devt) {
|
||||
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
|
||||
}
|
||||
@@ -263,17 +276,97 @@ static struct block2mtd_dev *add_device(
|
||||
@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
|
||||
#endif
|
||||
|
||||
if (IS_ERR(bdev)) {
|
||||
@@ -498,9 +498,10 @@
|
||||
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
|
||||
+ if (!bdev || !bdev->bd_disk)
|
||||
+ err = -EINVAL;
|
||||
+ else {
|
||||
+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
|
||||
+ else
|
||||
+ err = rescan_partitions(bdev->bd_disk, bdev);
|
||||
+ }
|
||||
+#endif
|
||||
+ if (bdev)
|
||||
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
|
||||
+
|
||||
@@ -535,7 +536,7 @@
|
||||
|
||||
if (!mtdname)
|
||||
mtdname = devname;
|
||||
@@ -297,6 +390,7 @@ static struct block2mtd_dev *add_device(
|
||||
@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
|
||||
dev->mtd.read = block2mtd_read;
|
||||
dev->mtd.priv = dev;
|
||||
dev->mtd.owner = THIS_MODULE;
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
|
||||
Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
|
||||
Date: Fri Dec 4 11:06:32 2009 +0000
|
||||
|
||||
atm: [br2684] allow routed mode operation again
|
||||
|
||||
in routed mode, we don't have a hardware address so netdev_ops doesnt
|
||||
need to validate our hardware address via .ndo_validate_addr
|
||||
|
||||
Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
|
||||
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/net/atm/br2684.c
|
||||
+++ b/net/atm/br2684.c
|
||||
@@ -536,6 +536,12 @@ static const struct net_device_ops br268
|
||||
.ndo_validate_addr = eth_validate_addr,
|
||||
};
|
||||
|
||||
+static const struct net_device_ops br2684_netdev_ops_routed = {
|
||||
+ .ndo_start_xmit = br2684_start_xmit,
|
||||
+ .ndo_set_mac_address = br2684_mac_addr,
|
||||
+ .ndo_change_mtu = eth_change_mtu
|
||||
+};
|
||||
+
|
||||
static void br2684_setup(struct net_device *netdev)
|
||||
{
|
||||
struct br2684_dev *brdev = BRPRIV(netdev);
|
||||
@@ -551,11 +557,10 @@ static void br2684_setup(struct net_devi
|
||||
static void br2684_setup_routed(struct net_device *netdev)
|
||||
{
|
||||
struct br2684_dev *brdev = BRPRIV(netdev);
|
||||
- brdev->net_dev = netdev;
|
||||
|
||||
+ brdev->net_dev = netdev;
|
||||
netdev->hard_header_len = 0;
|
||||
-
|
||||
- netdev->netdev_ops = &br2684_netdev_ops;
|
||||
+ netdev->netdev_ops = &br2684_netdev_ops_routed;
|
||||
netdev->addr_len = 0;
|
||||
netdev->mtu = 1500;
|
||||
netdev->type = ARPHRD_PPP;
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -135,4 +135,25 @@ config MDIO_GPIO
|
||||
@@ -135,4 +135,29 @@ config MDIO_GPIO
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called mdio-gpio.
|
||||
|
||||
@@ -17,9 +17,13 @@
|
||||
+ tristate "Driver for the Realtek RTL8366S switch"
|
||||
+ select SWCONFIG
|
||||
+
|
||||
+config RTL8366RB_PHY
|
||||
+ tristate "Driver for the Realtek RTL8366RB switch"
|
||||
+ select SWCONFIG
|
||||
+
|
||||
+config RTL8366S_PHY_DEBUG_FS
|
||||
+ bool "RTL8366S switch driver DEBUG_FS support"
|
||||
+ depends on RTL8366S_PHY
|
||||
+ bool "RTL8366 switch driver DEBUG_FS support"
|
||||
+ depends on RTL8366S_PHY || RTL8366RB_PHY
|
||||
+ depends on DEBUG_FS
|
||||
+ default n
|
||||
+
|
||||
@@ -28,12 +32,13 @@
|
||||
endif # PHYLIB
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -19,6 +19,8 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
|
||||
@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
|
||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
||||
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
|
||||
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
|
||||
+obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
|
||||
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
|
||||
obj-$(CONFIG_FIXED_PHY) += fixed.o
|
||||
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
|
||||
|
||||
Reference in New Issue
Block a user