From 71d27ec3dab835cd01d2ed2207b0e49ff8943e6e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 21 Nov 2014 08:20:25 -0600 Subject: [PATCH] apps/examples/bridge: Add host-side test driver --- configs/sama5d3-xplained/bridge/defconfig | 2 ++ fs/vfs/fs_poll.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig index feea51f4fa2..0fa04e6461a 100644 --- a/configs/sama5d3-xplained/bridge/defconfig +++ b/configs/sama5d3-xplained/bridge/defconfig @@ -813,6 +813,7 @@ CONFIG_EXAMPLES_BRIDGE_NET1_MACADDR=0x00e0deadbeef CONFIG_EXAMPLES_BRIDGE_NET1_IPADDR=0x0a000002 CONFIG_EXAMPLES_BRIDGE_NET1_DRIPADDR=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET1_NETMASK=0xffffff00 +CONFIG_EXAMPLES_BRIDGE_NET1_IPHOST=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET1_STACKSIZE=2048 CONFIG_EXAMPLES_BRIDGE_NET1_PRIORITY=100 @@ -829,6 +830,7 @@ CONFIG_EXAMPLES_BRIDGE_NET2_MACADDR=0x00e0f00dface CONFIG_EXAMPLES_BRIDGE_NET2_IPADDR=0x0a000003 CONFIG_EXAMPLES_BRIDGE_NET2_DRIPADDR=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET2_NETMASK=0xffffff00 +CONFIG_EXAMPLES_BRIDGE_NET2_IPHOST=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET2_STACKSIZE=2048 CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100 # CONFIG_EXAMPLES_BUTTONS is not set diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c index a7fd5ed62eb..d968defb624 100644 --- a/fs/vfs/fs_poll.c +++ b/fs/vfs/fs_poll.c @@ -346,6 +346,8 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) } else { + /* EINTR is the only other error expected in normal operation */ + ret = -err; } }